From: William Lallemand <wlallemand@haproxy.com>
Date: Fri, 26 Oct 2018 12:47:46 +0000 (+0200)
Subject: MEDIUM: channel: reorder the channel analyzers for the cli
X-Git-Tag: v1.9-dev5~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90b1ca1ff5ef84df91012efb7ec321e4f70ab5b2;p=thirdparty%2Fhaproxy.git

MEDIUM: channel: reorder the channel analyzers for the cli

Reorder the channel analyzers so the CLI analyzers are defined before
the XFER_DATA ones.
---

diff --git a/include/types/channel.h b/include/types/channel.h
index e4f2824ece..7622ce8f44 100644
--- a/include/types/channel.h
+++ b/include/types/channel.h
@@ -150,38 +150,38 @@
 #define AN_REQ_STICKING_RULES   0x00002000  /* table persistence matching */
 /* AN_REQ_FLT_HTTP_HDRS:        0x00004000 */
 #define AN_REQ_HTTP_XFER_BODY   0x00008000  /* forward request body */
-/* AN_REQ_FLT_XFER_DATA:        0x00010000 */
-/* AN_REQ_FLT_END:              0x00020000 */
-#define AN_REQ_ALL              0x0000bfbe  /* all of the request analysers */
+#define AN_REQ_WAIT_CLI         0x00010000
+/* AN_REQ_FLT_XFER_DATA:        0x00020000 */
+/* AN_REQ_FLT_END:              0x00040000 */
+#define AN_REQ_ALL              0x0001bfbe  /* all of the request analysers */
 
 /* response analysers */
-/* AN_RES_FLT_START_FE:         0x00040000 */
-/* AN_RES_FLT_START_BE:         0x00080000 */
-#define AN_RES_INSPECT          0x00100000  /* content inspection */
-#define AN_RES_WAIT_HTTP        0x00200000  /* wait for HTTP response */
-#define AN_RES_STORE_RULES      0x00400000  /* table persistence matching */
-#define AN_RES_HTTP_PROCESS_BE  0x00800000  /* process backend's HTTP part */
-#define AN_RES_HTTP_PROCESS_FE  0x00800000  /* process frontend's HTTP part (same for now) */
-/* AN_RES_FLT_HTTP_HDRS:        0x01000000 */
-#define AN_RES_HTTP_XFER_BODY   0x02000000  /* forward response body */
-/* AN_RES_FLT_XFER_DATA:        0x04000000 */
-/* AN_RES_FLT_END:              0x08000000 */
-#define AN_RES_ALL              0x02f00000  /* all of the response analysers */
-
+/* AN_RES_FLT_START_FE:         0x00080000 */
+/* AN_RES_FLT_START_BE:         0x00100000 */
+#define AN_RES_INSPECT          0x00200000  /* content inspection */
+#define AN_RES_WAIT_HTTP        0x00400000  /* wait for HTTP response */
+#define AN_RES_STORE_RULES      0x00800000  /* table persistence matching */
+#define AN_RES_HTTP_PROCESS_BE  0x01000000  /* process backend's HTTP part */
+#define AN_RES_HTTP_PROCESS_FE  0x01000000  /* process frontend's HTTP part (same for now) */
+/* AN_RES_FLT_HTTP_HDRS:        0x02000000 */
+#define AN_RES_HTTP_XFER_BODY   0x04000000  /* forward response body */
+#define AN_RES_WAIT_CLI         0x08000000
+/* AN_RES_FLT_XFER_DATA:        0x10000000 */
+/* AN_RES_FLT_END:              0x20000000 */
+#define AN_RES_ALL              0x0de00000  /* all of the response analysers */
+
+/* filters interleaved with analysers, see above */
 #define AN_REQ_FLT_START_FE     0x00000001
 #define AN_REQ_FLT_START_BE     0x00000040
 #define AN_REQ_FLT_HTTP_HDRS    0x00004000
-#define AN_REQ_FLT_XFER_DATA    0x00010000
-#define AN_REQ_FLT_END          0x00020000
-
-#define AN_RES_FLT_START_FE     0x00040000
-#define AN_RES_FLT_START_BE     0x00080000
-#define AN_RES_FLT_HTTP_HDRS    0x01000000
-#define AN_RES_FLT_XFER_DATA    0x04000000
-#define AN_RES_FLT_END          0x08000000
-
-#define AN_REQ_WAIT_CLI         0x10000000
-#define AN_RES_WAIT_CLI         0x20000000
+#define AN_REQ_FLT_XFER_DATA    0x00020000
+#define AN_REQ_FLT_END          0x00040000
+
+#define AN_RES_FLT_START_FE     0x00080000
+#define AN_RES_FLT_START_BE     0x00100000
+#define AN_RES_FLT_HTTP_HDRS    0x02000000
+#define AN_RES_FLT_XFER_DATA    0x10000000
+#define AN_RES_FLT_END          0x20000000
 
 /* Magic value to forward infinite size (TCP, ...), used with ->to_forward */
 #define CHN_INFINITE_FORWARD    MAX_RANGE(unsigned int)