commit afba57ae80d15dd947f51a2ea77c41b9fad6d2ee
author Willy Tarreau <w@1wt.eu> Tue Dec 11 13:44:24 2018 +0100
committer Willy Tarreau <w@1wt.eu> Tue Dec 11 17:15:13 2018 +0100
tree b8742111f3b30227536e2db764d8e916b0ca2b4a
parent 30925659ef21de786e3bf0dbf1013b9ce871d9ba

REORG: h1: merge types+proto into common/h1.h

These two files are self-contained and do not depend on other
layers, so let's remerge them together for easier manipulation.

src/h1.c

diff --git a/src/h1.c b/src/h1.c
index c2195bc..37a1442 100644
--- a/src/h1.c
+++ b/src/h1.c
@@ -12,10 +12,10 @@
 
 #include <ctype.h>
 #include <common/config.h>
+#include <common/h1.h>
 #include <common/http-hdr.h>
 
 #include <proto/channel.h>
-#include <proto/h1.h>
 #include <proto/hdr_idx.h>
 
 /* Parse the Content-Length header field of an HTTP/1 request. The function

src/http_fetch.c

diff --git a/src/http_fetch.c b/src/http_fetch.c
index 5f6cb6c..68c455c 100644
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -21,6 +21,7 @@
 #include <common/compat.h>
 #include <common/config.h>
 #include <common/debug.h>
+#include <common/h1.h>
 #include <common/http.h>
 #include <common/htx.h>
 #include <common/initcall.h>
@@ -32,7 +33,6 @@
 
 #include <proto/arg.h>
 #include <proto/auth.h>
-#include <proto/h1.h>
 #include <proto/hdr_idx.h>
 #include <proto/http_fetch.h>
 #include <proto/http_htx.h>

src/http_htx.c

diff --git a/src/http_htx.c b/src/http_htx.c
index 401e7f1..eb71354 100644
--- a/src/http_htx.c
+++ b/src/http_htx.c
@@ -12,10 +12,10 @@
 
 #include <common/config.h>
 #include <common/cfgparse.h>
+#include <common/h1.h>
 #include <common/http.h>
 #include <common/htx.h>
 
-#include <proto/h1.h>
 #include <proto/http_htx.h>
 
 struct buffer htx_err_chunks[HTTP_ERR_SIZE];

src/mux_h1.c

diff --git a/src/mux_h1.c b/src/mux_h1.c
index 037b239..a602b21 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -11,6 +11,7 @@
  */
 #include <common/cfgparse.h>
 #include <common/config.h>
+#include <common/h1.h>
 #include <common/htx.h>
 #include <common/initcall.h>
 
@@ -19,7 +20,6 @@
 #include <types/session.h>
 
 #include <proto/connection.h>
-#include <proto/h1.h>
 #include <proto/http_htx.h>
 #include <proto/log.h>
 #include <proto/stream.h>

src/mux_h2.c

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 8962be8..9a2f8c7 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -12,6 +12,7 @@
 
 #include <common/cfgparse.h>
 #include <common/config.h>
+#include <common/h1.h>
 #include <common/h2.h>
 #include <common/hpack-dec.h>
 #include <common/hpack-enc.h>
@@ -20,7 +21,6 @@
 #include <common/initcall.h>
 #include <common/net_helper.h>
 #include <proto/connection.h>
-#include <proto/h1.h>
 #include <proto/http_htx.h>
 #include <proto/stream.h>
 #include <types/session.h>

src/proto_http.c

diff --git a/src/proto_http.c b/src/proto_http.c
index a6492b6..a89ce1d 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -29,6 +29,7 @@
 #include <common/compat.h>
 #include <common/config.h>
 #include <common/debug.h>
+#include <common/h1.h>
 #include <common/memory.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>
@@ -57,7 +58,6 @@
 #include <proto/fd.h>
 #include <proto/filters.h>
 #include <proto/frontend.h>
-#include <proto/h1.h>
 #include <proto/log.h>
 #include <proto/hdr_idx.h>
 #include <proto/hlua.h>