From 87735330d194056a2ff3a7e79a24021ef6febe3e Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Thu, 4 Jun 2020 09:08:41 +0200
Subject: [PATCH] REORG: include: move http_htx.h to haproxy/http_htx{,-t}.h

A few includes had to be added, namely list-t.h in the type file and
types/proxy.h in the proto file. actions.h was including http-htx.h
but didn't need it so it was dropped.
---
 contrib/prometheus-exporter/service-prometheus.c   |  2 +-
 include/{types/http_htx.h => haproxy/http_htx-t.h} | 11 ++++++-----
 include/{proto => haproxy}/http_htx.h              | 14 +++++++-------
 include/types/action.h                             |  1 -
 include/types/http_ana.h                           |  2 +-
 src/51d.c                                          |  2 +-
 src/backend.c                                      |  2 +-
 src/cache.c                                        |  2 +-
 src/cfgparse-listen.c                              |  2 +-
 src/checks.c                                       |  2 +-
 src/da.c                                           |  2 +-
 src/fcgi-app.c                                     |  2 +-
 src/filters.c                                      |  2 +-
 src/flt_http_comp.c                                |  2 +-
 src/flt_trace.c                                    |  2 +-
 src/hlua.c                                         |  2 +-
 src/http_act.c                                     |  2 +-
 src/http_ana.c                                     |  2 +-
 src/http_fetch.c                                   |  2 +-
 src/http_htx.c                                     |  2 +-
 src/mux_fcgi.c                                     |  2 +-
 src/mux_h1.c                                       |  2 +-
 src/mux_h2.c                                       |  2 +-
 src/stats.c                                        |  2 +-
 src/stream_interface.c                             |  2 +-
 src/wurfl.c                                        |  2 +-
 26 files changed, 36 insertions(+), 36 deletions(-)
 rename include/{types/http_htx.h => haproxy/http_htx-t.h} (95%)
 rename include/{proto => haproxy}/http_htx.h (95%)

diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index b79fab587..7c58bab6c 100644
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -16,6 +16,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/http.h>
+#include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
@@ -28,7 +29,6 @@
 #include <haproxy/compression.h>
 #include <proto/frontend.h>
 #include <proto/listener.h>
-#include <proto/http_htx.h>
 #include <haproxy/pipe.h>
 #include <proto/proxy.h>
 #include <proto/sample.h>
diff --git a/include/types/http_htx.h b/include/haproxy/http_htx-t.h
similarity index 95%
rename from include/types/http_htx.h
rename to include/haproxy/http_htx-t.h
index b3af77e3c..dd3b2381f 100644
--- a/include/types/http_htx.h
+++ b/include/haproxy/http_htx-t.h
@@ -1,5 +1,5 @@
 /*
- * include/types/http_htx.h
+ * include/haproxy/http_htx-t.h
  * This file defines everything related to HTTP manipulation using the internal
  * representation.
  *
@@ -20,15 +20,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_HTTP_HTX_H
-#define _TYPES_HTTP_HTX_H
+#ifndef _HAPROXY_HTTP_HTX_T_H
+#define _HAPROXY_HTTP_HTX_T_H
 
 #include <import/ebistree.h>
 
 #include <haproxy/buf-t.h>
+#include <import/ist.h>
 #include <haproxy/http-t.h>
 #include <haproxy/htx-t.h>
-#include <import/ist.h>
+#include <haproxy/list-t.h>
 
 /* Context used to find/remove an HTTP header. */
 struct http_hdr_ctx {
@@ -92,4 +93,4 @@ struct http_errors {
 	struct list list;                     /* http-errors list */
 };
 
-#endif /* _TYPES_HTTP_HTX_H */
+#endif /* _HAPROXY_HTTP_HTX_T_H */
diff --git a/include/proto/http_htx.h b/include/haproxy/http_htx.h
similarity index 95%
rename from include/proto/http_htx.h
rename to include/haproxy/http_htx.h
index d480be868..775037be0 100644
--- a/include/proto/http_htx.h
+++ b/include/haproxy/http_htx.h
@@ -1,5 +1,5 @@
 /*
- * include/types/http_htx.h
+ * include/haproxy/http_htx-t.h
  * This file defines function prototypes for HTTP manipulation using the
  * internal representation.
  *
@@ -20,14 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_HTTP_HTX_H
-#define _PROTO_HTTP_HTX_H
+#ifndef _HAPROXY_HTTP_HTX_H
+#define _HAPROXY_HTTP_HTX_H
 
-#include <haproxy/buf.h>
 #include <import/ist.h>
+#include <haproxy/buf-t.h>
+#include <haproxy/http_htx-t.h>
 #include <haproxy/regex-t.h>
-
-#include <types/http_htx.h>
+#include <types/proxy.h>
 
 extern struct buffer http_err_chunks[HTTP_ERR_SIZE];
 extern struct http_reply http_err_replies[HTTP_ERR_SIZE];
@@ -73,4 +73,4 @@ struct buffer *http_parse_errorloc(int errloc, int status, const char *url, char
 int proxy_dup_default_conf_errors(struct proxy *curpx, struct proxy *defpx, char **errmsg);
 void proxy_release_conf_errors(struct proxy *px);
 
-#endif /* _PROTO_HTTP_HTX_H */
+#endif /* _HAPROXY_HTTP_HTX_H */
diff --git a/include/types/action.h b/include/types/action.h
index a102b2b92..c70fcf733 100644
--- a/include/types/action.h
+++ b/include/types/action.h
@@ -26,7 +26,6 @@
 
 #include <types/applet.h>
 #include <types/stick_table.h>
-#include <types/http_htx.h>
 
 enum act_from {
 	ACT_F_TCP_REQ_CON, /* tcp-request connection */
diff --git a/include/types/http_ana.h b/include/types/http_ana.h
index 4a1a9cdce..4dd8e3336 100644
--- a/include/types/http_ana.h
+++ b/include/types/http_ana.h
@@ -26,7 +26,7 @@
 #include <haproxy/http-t.h>
 
 #include <types/channel.h>
-#include <types/http_htx.h>
+#include <haproxy/http_htx-t.h>
 
 /* These are the flags that are found in txn->flags */
 
diff --git a/src/51d.c b/src/51d.c
index ab628fe64..d6033f34a 100644
--- a/src/51d.c
+++ b/src/51d.c
@@ -5,11 +5,11 @@
 #include <haproxy/chunk.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/errors.h>
+#include <haproxy/http_htx.h>
 #include <haproxy/thread.h>
 #include <types/global.h>
 #include <proto/arg.h>
 #include <proto/http_fetch.h>
-#include <proto/http_htx.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
 #include <proto/sample.h>
diff --git a/src/backend.c b/src/backend.c
index a78aad8aa..22f8603c8 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -22,6 +22,7 @@
 #include <haproxy/api.h>
 #include <haproxy/hash.h>
 #include <haproxy/http.h>
+#include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
@@ -35,7 +36,6 @@
 #include <proto/channel.h>
 #include <proto/checks.h>
 #include <proto/frontend.h>
-#include <proto/http_htx.h>
 #include <proto/lb_chash.h>
 #include <proto/lb_fas.h>
 #include <proto/lb_fwlc.h>
diff --git a/src/cache.c b/src/cache.c
index 02083c05c..0fa1c642f 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -11,6 +11,7 @@
  */
 
 #include <haproxy/api.h>
+#include <haproxy/http_htx.h>
 #include <haproxy/shctx.h>
 #include <import/eb32tree.h>
 #include <import/sha1.h>
@@ -23,7 +24,6 @@
 #include <proto/channel.h>
 #include <proto/cli.h>
 #include <proto/proxy.h>
-#include <proto/http_htx.h>
 #include <proto/filters.h>
 #include <proto/http_rules.h>
 #include <proto/http_ana.h>
diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c
index c9c6b7523..0fdf5dbc6 100644
--- a/src/cfgparse-listen.c
+++ b/src/cfgparse-listen.c
@@ -16,12 +16,12 @@
 
 #include <types/capture.h>
 #include <haproxy/compression-t.h>
+#include <haproxy/http_htx.h>
 #include <types/stats.h>
 
 #include <proto/acl.h>
 #include <proto/checks.h>
 #include <proto/connection.h>
-#include <proto/http_htx.h>
 #include <proto/http_rules.h>
 #include <proto/listener.h>
 #include <haproxy/protocol.h>
diff --git a/src/checks.c b/src/checks.c
index 59c176031..b5c76fbf4 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -40,6 +40,7 @@
 #include <haproxy/time.h>
 #include <haproxy/thread.h>
 #include <haproxy/http.h>
+#include <haproxy/http_htx.h>
 #include <haproxy/h1.h>
 #include <haproxy/htx.h>
 
@@ -53,7 +54,6 @@
 #include <proto/checks.h>
 #include <proto/stats.h>
 #include <haproxy/fd.h>
-#include <proto/http_htx.h>
 #include <proto/log.h>
 #include <proto/mux_pt.h>
 #include <proto/queue.h>
diff --git a/src/da.c b/src/da.c
index 51f6e3823..a9bc696aa 100644
--- a/src/da.c
+++ b/src/da.c
@@ -4,10 +4,10 @@
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
 #include <haproxy/http.h>
+#include <haproxy/http_htx.h>
 #include <types/global.h>
 #include <proto/arg.h>
 #include <proto/http_fetch.h>
-#include <proto/http_htx.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
 #include <proto/sample.h>
diff --git a/src/fcgi-app.c b/src/fcgi-app.c
index d846c25db..d9f6bdbe2 100644
--- a/src/fcgi-app.c
+++ b/src/fcgi-app.c
@@ -14,6 +14,7 @@
 #include <haproxy/chunk.h>
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
+#include <haproxy/http_htx.h>
 #include <haproxy/regex.h>
 #include <haproxy/tools.h>
 
@@ -23,7 +24,6 @@
 #include <proto/fcgi-app.h>
 #include <proto/filters.h>
 #include <proto/http_fetch.h>
-#include <proto/http_htx.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/sample.h>
diff --git a/src/filters.c b/src/filters.c
index 592b30320..965b54fa0 100644
--- a/src/filters.c
+++ b/src/filters.c
@@ -14,6 +14,7 @@
 #include <haproxy/buf-t.h>
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
+#include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/namespace.h>
 #include <haproxy/tools.h>
@@ -24,7 +25,6 @@
 #include <haproxy/compression.h>
 #include <proto/filters.h>
 #include <proto/flt_http_comp.h>
-#include <proto/http_htx.h>
 #include <proto/http_ana.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 8d02fc759..c081e2790 100644
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -14,6 +14,7 @@
 #include <haproxy/compression.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/http.h>
+#include <haproxy/http_htx.h>
 #include <common/cfgparse.h>
 #include <haproxy/htx.h>
 #include <haproxy/list.h>
@@ -24,7 +25,6 @@
 #include <types/sample.h>
 
 #include <proto/filters.h>
-#include <proto/http_htx.h>
 #include <proto/http_ana.h>
 #include <proto/sample.h>
 #include <proto/stream.h>
diff --git a/src/flt_trace.c b/src/flt_trace.c
index 64dc564df..362040c37 100644
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -13,6 +13,7 @@
 #include <ctype.h>
 
 #include <haproxy/api.h>
+#include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
@@ -24,7 +25,6 @@
 #include <types/stream.h>
 
 #include <proto/filters.h>
-#include <proto/http_htx.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
 #include <proto/stream.h>
diff --git a/src/hlua.c b/src/hlua.c
index 3de0bea1a..daf2a8f06 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -25,6 +25,7 @@
 #include <import/ebpttree.h>
 
 #include <common/cfgparse.h>
+#include <haproxy/http_htx.h>
 #include <haproxy/thread.h>
 #include <haproxy/regex.h>
 #include <haproxy/xref.h>
@@ -45,7 +46,6 @@
 #include <proto/hlua.h>
 #include <proto/hlua_fcn.h>
 #include <proto/http_fetch.h>
-#include <proto/http_htx.h>
 #include <proto/http_rules.h>
 #include <proto/map.h>
 #include <proto/obj_type.h>
diff --git a/src/http_act.c b/src/http_act.c
index 165cae27d..cba3c7965 100644
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -20,6 +20,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/chunk.h>
 #include <haproxy/http.h>
+#include <haproxy/http_htx.h>
 #include <haproxy/pool.h>
 #include <haproxy/regex.h>
 #include <haproxy/tools.h>
@@ -33,7 +34,6 @@
 #include <proto/arg.h>
 #include <proto/action.h>
 #include <proto/http_rules.h>
-#include <proto/http_htx.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
 #include <proto/pattern.h>
diff --git a/src/http_ana.c b/src/http_ana.c
index 3065e3837..d26b9a444 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -13,6 +13,7 @@
 #include <haproxy/api.h>
 #include <haproxy/base64.h>
 #include <haproxy/http.h>
+#include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/regex.h>
@@ -26,7 +27,6 @@
 #include <proto/checks.h>
 #include <proto/connection.h>
 #include <proto/filters.h>
-#include <proto/http_htx.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
 #include <proto/proxy.h>
diff --git a/src/http_fetch.c b/src/http_fetch.c
index f21d77c0a..42ba8c2f7 100644
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -22,6 +22,7 @@
 #include <haproxy/h1.h>
 #include <haproxy/h1_htx.h>
 #include <haproxy/http.h>
+#include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/pool.h>
 #include <haproxy/tools.h>
@@ -34,7 +35,6 @@
 #include <proto/channel.h>
 #include <proto/connection.h>
 #include <proto/http_fetch.h>
-#include <proto/http_htx.h>
 #include <proto/log.h>
 #include <proto/obj_type.h>
 #include <proto/http_ana.h>
diff --git a/src/http_htx.c b/src/http_htx.c
index f345b4b14..af4dd5cec 100644
--- a/src/http_htx.c
+++ b/src/http_htx.c
@@ -21,10 +21,10 @@
 #include <common/cfgparse.h>
 #include <haproxy/h1.h>
 #include <haproxy/http.h>
+#include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 
 #include <proto/arg.h>
-#include <proto/http_htx.h>
 #include <proto/http_fetch.h>
 #include <proto/sample.h>
 
diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 6473e725c..3c95b6475 100644
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -15,6 +15,7 @@
 #include <haproxy/fcgi.h>
 #include <haproxy/h1.h>
 #include <haproxy/h1_htx.h>
+#include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <import/ist.h>
 #include <haproxy/list.h>
@@ -26,7 +27,6 @@
 
 #include <proto/connection.h>
 #include <proto/fcgi-app.h>
-#include <proto/http_htx.h>
 #include <proto/log.h>
 #include <proto/session.h>
 #include <proto/ssl_sock.h>
diff --git a/src/mux_h1.c b/src/mux_h1.c
index e0d856fc9..107794c3d 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -24,7 +24,7 @@
 #include <types/session.h>
 
 #include <proto/connection.h>
-#include <proto/http_htx.h>
+#include <haproxy/http_htx.h>
 #include <proto/log.h>
 #include <proto/session.h>
 #include <proto/stream.h>
diff --git a/src/mux_h2.c b/src/mux_h2.c
index 6ff418438..02f6a5f96 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -18,10 +18,10 @@
 #include <haproxy/hpack-dec.h>
 #include <haproxy/hpack-enc.h>
 #include <haproxy/hpack-tbl.h>
+#include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/net_helper.h>
 #include <proto/connection.h>
-#include <proto/http_htx.h>
 #include <proto/trace.h>
 #include <proto/session.h>
 #include <proto/stream.h>
diff --git a/src/stats.c b/src/stats.c
index 21dd009c0..2700ab50a 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -29,6 +29,7 @@
 #include <haproxy/compression.h>
 #include <haproxy/debug.h>
 #include <haproxy/http.h>
+#include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
@@ -54,7 +55,6 @@
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
 #include <proto/frontend.h>
-#include <proto/http_htx.h>
 #include <proto/log.h>
 #include <proto/pattern.h>
 #include <haproxy/pipe.h>
diff --git a/src/stream_interface.c b/src/stream_interface.c
index 157fa51fc..02d20a003 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -21,6 +21,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/dynbuf.h>
+#include <haproxy/http_htx.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
@@ -28,7 +29,6 @@
 #include <proto/applet.h>
 #include <proto/channel.h>
 #include <proto/connection.h>
-#include <proto/http_htx.h>
 #include <proto/mux_pt.h>
 #include <haproxy/pipe.h>
 #include <proto/proxy.h>
diff --git a/src/wurfl.c b/src/wurfl.c
index 0bc10fa98..9f374fa65 100644
--- a/src/wurfl.c
+++ b/src/wurfl.c
@@ -6,12 +6,12 @@
 #include <common/cfgparse.h>
 #include <haproxy/chunk.h>
 #include <haproxy/errors.h>
+#include <haproxy/http_htx.h>
 #include <types/global.h>
 #include <proto/arg.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
 #include <proto/http_fetch.h>
-#include <proto/http_htx.h>
 #include <proto/sample.h>
 #include <import/ebsttree.h>
 #include <import/ebmbtree.h>