REORG: htx: merge types+proto into common/htx.h
All the HTX definition is self-contained and doesn't really depend on
anything external since it's a mostly protocol. In addition, some
external similar files (like h2) also placed in common used to rely
on it, making it a bit awkward.
This patch moves the two htx.h files into a single self-contained one.
The historical dependency on sample.h could be also removed since it
used to be there only for http_meth_t which is now in http.h.
diff --git a/src/cache.c b/src/cache.c
index 407d150..9cfb535 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -24,7 +24,6 @@
#include <proto/proxy.h>
#include <proto/hdr_idx.h>
#include <proto/http_htx.h>
-#include <proto/htx.h>
#include <proto/filters.h>
#include <proto/http_rules.h>
#include <proto/proto_http.h>
@@ -36,6 +35,7 @@
#include <common/cfgparse.h>
#include <common/hash.h>
+#include <common/htx.h>
#include <common/initcall.h>
/* flt_cache_store */
diff --git a/src/filters.c b/src/filters.c
index d082261..4f3fae7 100644
--- a/src/filters.c
+++ b/src/filters.c
@@ -16,6 +16,7 @@
#include <common/compat.h>
#include <common/config.h>
#include <common/errors.h>
+#include <common/htx.h>
#include <common/initcall.h>
#include <common/namespace.h>
#include <common/standard.h>
@@ -28,7 +29,6 @@
#include <proto/filters.h>
#include <proto/flt_http_comp.h>
#include <proto/http_htx.h>
-#include <proto/htx.h>
#include <proto/proto_http.h>
#include <proto/stream.h>
#include <proto/stream_interface.h>
diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
index 2d1a7fd..aaab32e 100644
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -12,6 +12,7 @@
#include <common/buffer.h>
#include <common/cfgparse.h>
+#include <common/htx.h>
#include <common/initcall.h>
#include <common/mini-clist.h>
#include <common/standard.h>
@@ -26,7 +27,6 @@
#include <proto/filters.h>
#include <proto/hdr_idx.h>
#include <proto/http_htx.h>
-#include <proto/htx.h>
#include <proto/proto_http.h>
#include <proto/sample.h>
#include <proto/stream.h>
diff --git a/src/flt_trace.c b/src/flt_trace.c
index 0ccf1fc..1daeb22 100644
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -13,6 +13,7 @@
#include <ctype.h>
#include <common/hathreads.h>
+#include <common/htx.h>
#include <common/initcall.h>
#include <common/standard.h>
#include <common/time.h>
@@ -28,7 +29,6 @@
#include <proto/filters.h>
#include <proto/hdr_idx.h>
#include <proto/http_htx.h>
-#include <proto/htx.h>
#include <proto/log.h>
#include <proto/proto_http.h>
#include <proto/stream.h>
diff --git a/src/http_fetch.c b/src/http_fetch.c
index 5f579d1..995622b 100644
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -22,6 +22,7 @@
#include <common/config.h>
#include <common/debug.h>
#include <common/http.h>
+#include <common/htx.h>
#include <common/initcall.h>
#include <common/memory.h>
#include <common/standard.h>
@@ -33,7 +34,6 @@
#include <proto/auth.h>
#include <proto/http_fetch.h>
#include <proto/http_htx.h>
-#include <proto/htx.h>
#include <proto/log.h>
#include <proto/obj_type.h>
#include <proto/proto_http.h>
diff --git a/src/http_htx.c b/src/http_htx.c
index 83768f6..401e7f1 100644
--- a/src/http_htx.c
+++ b/src/http_htx.c
@@ -13,10 +13,10 @@
#include <common/config.h>
#include <common/cfgparse.h>
#include <common/http.h>
+#include <common/htx.h>
#include <proto/h1.h>
#include <proto/http_htx.h>
-#include <proto/htx.h>
struct buffer htx_err_chunks[HTTP_ERR_SIZE];
diff --git a/src/htx.c b/src/htx.c
index 78bfd57..bda293b 100644
--- a/src/htx.c
+++ b/src/htx.c
@@ -11,7 +11,7 @@
*/
#include <common/chunk.h>
-#include <proto/htx.h>
+#include <common/htx.h>
struct htx htx_empty = { .size = 0, .data = 0, .used = 0 };
diff --git a/src/mux_h1.c b/src/mux_h1.c
index fa3ffa8..037b239 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/htx.h>
#include <common/initcall.h>
#include <types/pipe.h>
@@ -20,7 +21,6 @@
#include <proto/connection.h>
#include <proto/h1.h>
#include <proto/http_htx.h>
-#include <proto/htx.h>
#include <proto/log.h>
#include <proto/stream.h>
#include <proto/stream_interface.h>
diff --git a/src/mux_h2.c b/src/mux_h2.c
index 15fd304..8962be8 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -16,12 +16,12 @@
#include <common/hpack-dec.h>
#include <common/hpack-enc.h>
#include <common/hpack-tbl.h>
+#include <common/htx.h>
#include <common/initcall.h>
#include <common/net_helper.h>
#include <proto/connection.h>
#include <proto/h1.h>
#include <proto/http_htx.h>
-#include <proto/htx.h>
#include <proto/stream.h>
#include <types/session.h>
#include <eb32tree.h>
diff --git a/src/proto_htx.c b/src/proto_htx.c
index 2ba383e..6c637cb 100644
--- a/src/proto_htx.c
+++ b/src/proto_htx.c
@@ -13,6 +13,7 @@
#include <common/base64.h>
#include <common/config.h>
#include <common/debug.h>
+#include <common/htx.h>
#include <common/uri_auth.h>
#include <types/cache.h>
@@ -26,7 +27,6 @@
#include <proto/filters.h>
#include <proto/hdr_idx.h>
#include <proto/http_htx.h>
-#include <proto/htx.h>
#include <proto/log.h>
#include <proto/pattern.h>
#include <proto/proto_http.h>
diff --git a/src/stats.c b/src/stats.c
index c85d411..be70dde 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -29,6 +29,7 @@
#include <common/config.h>
#include <common/debug.h>
#include <common/http.h>
+#include <common/htx.h>
#include <common/initcall.h>
#include <common/memory.h>
#include <common/mini-clist.h>
@@ -54,7 +55,6 @@
#include <proto/fd.h>
#include <proto/freq_ctr.h>
#include <proto/frontend.h>
-#include <proto/htx.h>
#include <proto/log.h>
#include <proto/pattern.h>
#include <proto/pipe.h>
diff --git a/src/stream.c b/src/stream.c
index d79f86c..7add3dc 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -19,6 +19,7 @@
#include <common/buffer.h>
#include <common/debug.h>
#include <common/hathreads.h>
+#include <common/htx.h>
#include <common/initcall.h>
#include <common/memory.h>
@@ -46,7 +47,6 @@
#include <proto/hdr_idx.h>
#include <proto/hlua.h>
#include <proto/http_rules.h>
-#include <proto/htx.h>
#include <proto/listener.h>
#include <proto/log.h>
#include <proto/raw_sock.h>