From 7e266c7936a95602aceb2763885381bb020c04eb Mon Sep 17 00:00:00 2001
From: Christopher Faulet <cfaulet@haproxy.com>
Date: Wed, 3 Oct 2018 14:15:28 +0200
Subject: [PATCH] MINOR: http: Move comment about some HTTP macros in the right
 header file

HTTP_FLG_* and HTTP_IS_* were moved from "proto/proto_http.h" to "common/http.h"
but the associated comment was forgotten during the move.

This is 1.9-specific and should not be backported.
---
 include/common/http.h      | 14 +++++++++++++-
 include/proto/proto_http.h | 13 -------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/include/common/http.h b/include/common/http.h
index 9da2af8577..f876891158 100644
--- a/include/common/http.h
+++ b/include/common/http.h
@@ -26,7 +26,19 @@
 #include <common/buf.h>
 #include <common/ist.h>
 
-/* these macros are used mainly when parsing header fields */
+/*
+ * some macros mainly used when parsing header fileds.
+ * from RFC7230:
+ *   CTL                 = <any US-ASCII control character (octets 0 - 31) and DEL (127)>
+ *   SEP                 = one of the 17 defined separators or SP or HT
+ *   LWS                 = CR, LF, SP or HT
+ *   SPHT                = SP or HT. Use this macro and not a boolean expression for best speed.
+ *   CRLF                = CR or LF. Use this macro and not a boolean expression for best speed.
+ *   token               = any CHAR except CTL or SEP. Use this macro and not a boolean expression for best speed.
+ *
+ * added for ease of use:
+ *   ver_token           = 'H', 'P', 'T', '/', '.', and digits.
+ */
 #define HTTP_FLG_CTL  0x01
 #define HTTP_FLG_SEP  0x02
 #define HTTP_FLG_LWS  0x04
diff --git a/include/proto/proto_http.h b/include/proto/proto_http.h
index 1829c6830b..ddccabf05b 100644
--- a/include/proto/proto_http.h
+++ b/include/proto/proto_http.h
@@ -29,19 +29,6 @@
 #include <proto/channel.h>
 #include <proto/h1.h>
 
-/*
- * some macros used for the request parsing.
- * from RFC7230:
- *   CTL                 = <any US-ASCII control character (octets 0 - 31) and DEL (127)>
- *   SEP                 = one of the 17 defined separators or SP or HT
- *   LWS                 = CR, LF, SP or HT
- *   SPHT                = SP or HT. Use this macro and not a boolean expression for best speed.
- *   CRLF                = CR or LF. Use this macro and not a boolean expression for best speed.
- *   token               = any CHAR except CTL or SEP. Use this macro and not a boolean expression for best speed.
- *
- * added for ease of use:
- *   ver_token           = 'H', 'P', 'T', '/', '.', and digits.
- */
 
 extern struct pool_head *pool_head_uniqueid;