CLEANUP: h1: remove some occurrences of unneeded h1.h inclusions

Several places where h1.h was included didn't need it at all since
they in fact relied on the legacy HTTP definitions.

diff --git a/include/proto/http_htx.h b/include/proto/http_htx.h
index 7a2e008ae7600b7042b4c0486f9e1aaca118b350..6028292d294431d9a6607014089e7bdbe621eb7f 100644 (file)
--- a/include/proto/http_htx.h
+++ b/include/proto/http_htx.h
@@ -26,7 +26,6 @@
 #include <common/buf.h>
 #include <common/ist.h>
 
-#include <types/h1.h>
 #include <types/http_htx.h>
 
 extern struct buffer htx_err_chunks[HTTP_ERR_SIZE];

diff --git a/include/proto/proto_http.h b/include/proto/proto_http.h
index db85fae8c197fdfc2d2f1731895674ed26d57598..1d210336fdf869f0a051ac1a8f18c32c1a56da7d 100644 (file)
--- a/include/proto/proto_http.h
+++ b/include/proto/proto_http.h
@@ -27,7 +27,6 @@
 #include <types/stream.h>
 #include <types/task.h>
 #include <proto/channel.h>
-#include <proto/h1.h>
 
 #define IS_HTX_STRM(strm) (strm_fe(strm)->options2 & PR_O2_USE_HTX)
 #define IS_HTX_SMP(smp)   ((smp)->strm && IS_HTX_STRM((smp)->strm))

diff --git a/include/types/proto_http.h b/include/types/proto_http.h
index 972a6d33088734be4bd40654b20e8edd80fba17e..21910a91e990f062701b8006580504263447540b 100644 (file)
--- a/include/types/proto_http.h
+++ b/include/types/proto_http.h
@@ -29,7 +29,6 @@
 #include <common/regex.h>
 
 #include <types/channel.h>
-#include <types/h1.h>
 #include <types/hdr_idx.h>
 #include <types/filters.h>
 //#include <types/sample.h>

diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
index aaab32e7266b52dbc81056d1ea17057f75cb424b..74a8ae72a077a8cdb1a0366828ae7eafc5a73781 100644 (file)
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -19,7 +19,6 @@
 
 #include <types/compression.h>
 #include <types/filters.h>
-#include <types/h1.h>
 #include <types/proxy.h>
 #include <types/sample.h>
 

diff --git a/src/flt_trace.c b/src/flt_trace.c
index 1daeb22b97d7e5e5cfda18722aab07127c19cea2..3cfd842ce1aa89e448dc3860b2dcbfee12bcbef2 100644 (file)
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -22,7 +22,6 @@
 #include <types/channel.h>
 #include <types/filters.h>
 #include <types/global.h>
-#include <types/h1.h>
 #include <types/proxy.h>
 #include <types/stream.h>
 

diff --git a/src/hlua_fcn.c b/src/hlua_fcn.c
index f977d64a0a74c8b4e675300406c62f6aa16ac685..472fb0c718160664fa403380cac40cefb79f9f84 100644 (file)
--- a/src/hlua_fcn.c
+++ b/src/hlua_fcn.c
@@ -26,7 +26,6 @@
 #include <types/proxy.h>
 #include <types/stats.h>
 
-#include <proto/h1.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
 #include <proto/stats.h>

diff --git a/src/http_fetch.c b/src/http_fetch.c
index 14b8ba239c962f135fda03b20ab52d8ea368aa0d..5f6cb6cfefd89f5f604c57ac8bb746a4d30f75f7 100644 (file)
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -32,6 +32,7 @@
 
 #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>

diff --git a/src/log.c b/src/log.c
index 3093ccea3b7e8a631a801c56095491a280d6b2c3..6c6efedae1250254d3e18ca3bff3741a3393bf46 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -37,7 +37,6 @@
 #include <proto/applet.h>
 #include <proto/cli.h>
 #include <proto/frontend.h>
-#include <proto/h1.h>
 #include <proto/log.h>
 #include <proto/sample.h>
 #include <proto/stream.h>