CLEANUP: mux-h1: Reorder H1 connection flags to avoid holes

diff --git a/include/haproxy/mux_h1-t.h b/include/haproxy/mux_h1-t.h
index 56b5d52aebcb23499e2e7da5a48cec7f86337d6d..450707e5b3f204f8bfb374a272e085528067fcfe 100644 (file)
--- a/include/haproxy/mux_h1-t.h
+++ b/include/haproxy/mux_h1-t.h
@@ -37,24 +37,20 @@
 #define H1C_F_IN_ALLOC       0x00000010 /* mux is blocked on lack of input buffer */
 #define H1C_F_IN_FULL        0x00000020 /* mux is blocked on input buffer full */
 #define H1C_F_IN_SALLOC      0x00000040 /* mux is blocked on lack of stream's request buffer */
+/* 0x00000080 unused */
 
-/* 0x00000200 - 0x00000400 unused */
 #define H1C_F_EOS            0x00000100 /* End-of-stream seen on the H1 connection (read0 detected) */
 #define H1C_F_ERR_PENDING    0x00000200 /* A write error was detected (block sends but not reads) */
 #define H1C_F_ERROR          0x00000400 /* A read error was detected (handled has an abort) */
-
-/* 0x00001000 - 0x00002000 unused */
-#define H1C_F_SILENT_SHUT    0x00004000 /* if H1C is closed closed, silent (or dirty) shutdown must be performed */
-#define H1C_F_ABRT_PENDING   0x00008000 /* An error must be sent (previous attempt failed) and H1 connection must be closed ASAP */
-
-#define H1C_F_WANT_SPLICE    0x00010000 /* Don't read into a buffer because we want to use or we are using splicing */
-/* 0x00020000 unused */
-#define H1C_F_WAIT_NEXT_REQ  0x00040000 /*  waiting for the next request to start, use keep-alive timeout */
-#define H1C_F_UPG_H2C        0x00080000 /* set if an upgrade to h2 should be done */
-#define H1C_F_CO_MSG_MORE    0x00100000 /* set if CO_SFL_MSG_MORE must be set when calling xprt->snd_buf() */
-#define H1C_F_CO_STREAMER    0x00200000 /* set if CO_SFL_STREAMER must be set when calling xprt->snd_buf() */
-
-/* 0x00400000 - 0x40000000 unusued*/
+#define H1C_F_SILENT_SHUT    0x00000800 /* if H1C is closed closed, silent (or dirty) shutdown must be performed */
+#define H1C_F_ABRT_PENDING   0x00001000 /* An error must be sent (previous attempt failed) and H1 connection must be closed ASAP */
+#define H1C_F_WANT_SPLICE    0x00002000 /* Don't read into a buffer because we want to use or we are using splicing */
+#define H1C_F_WAIT_NEXT_REQ  0x00004000 /*  waiting for the next request to start, use keep-alive timeout */
+#define H1C_F_UPG_H2C        0x00008000 /* set if an upgrade to h2 should be done */
+#define H1C_F_CO_MSG_MORE    0x00010000 /* set if CO_SFL_MSG_MORE must be set when calling xprt->snd_buf() */
+#define H1C_F_CO_STREAMER    0x00020000 /* set if CO_SFL_STREAMER must be set when calling xprt->snd_buf() */
+
+/* 0x00040000 - 0x40000000 unusued*/
 #define H1C_F_IS_BACK        0x80000000 /* Set on outgoing connection */