From c6fe884c743aee70daf5f26da822d2da44ca5f5d Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Thu, 4 Jun 2020 09:00:02 +0200
Subject: [PATCH] REORG: include: move h1_htx.h to haproxy/h1_htx.h

This one didn't have a type file. A few missing includes were
added (htx, types).
---
 include/{proto => haproxy}/h1_htx.h | 12 +++++++-----
 src/h1_htx.c                        |  3 +--
 src/http_fetch.c                    |  2 +-
 src/mux_fcgi.c                      |  2 +-
 src/mux_h1.c                        |  2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)
 rename include/{proto => haproxy}/h1_htx.h (90%)

diff --git a/include/proto/h1_htx.h b/include/haproxy/h1_htx.h
similarity index 90%
rename from include/proto/h1_htx.h
rename to include/haproxy/h1_htx.h
index aa2c1f9a2..c73a274ba 100644
--- a/include/proto/h1_htx.h
+++ b/include/haproxy/h1_htx.h
@@ -1,5 +1,5 @@
 /*
- * include/types/h1_htx.h
+ * include/haproxy/h1_htx.h
  * This file defines function prototypes for H1 manipulation using the
  * internal representation.
  *
@@ -20,12 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_H1_HTX_H
-#define _PROTO_H1_HTX_H
+#ifndef _HAPROXY_H1_HTX_H
+#define _HAPROXY_H1_HTX_H
 
-#include <haproxy/buf.h>
 #include <import/ist.h>
+#include <haproxy/api-t.h>
+#include <haproxy/buf-t.h>
 #include <haproxy/h1.h>
+#include <haproxy/htx-t.h>
 
 int h1_parse_msg_hdrs(struct h1m *h1m, union h1_sl *h1sl, struct htx *dsthtx,
 		      struct buffer *srcbuf, size_t ofs, size_t max);
@@ -41,7 +43,7 @@ int h1_format_htx_stline(const struct htx_sl *sl, struct buffer *chk);
 int h1_format_htx_hdr(const struct ist n, const struct ist v, struct buffer *chk);
 int h1_format_htx_data(const struct ist data, struct buffer *chk, int chunked);
 
-#endif /* _PROTO_H1_HTX_H */
+#endif /* _HAPROXY_H1_HTX_H */
 
 /*
  * Local variables:
diff --git a/src/h1_htx.c b/src/h1_htx.c
index 1f0dddbd8..b27ddca81 100644
--- a/src/h1_htx.c
+++ b/src/h1_htx.c
@@ -13,11 +13,10 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/h1.h>
+#include <haproxy/h1_htx.h>
 #include <haproxy/http.h>
 #include <haproxy/htx.h>
 
-#include <proto/h1_htx.h>
-
 /* Estimate the size of the HTX headers after the parsing, including the EOH. */
 static size_t h1_eval_htx_hdrs_size(const struct http_hdr *hdrs)
 {
diff --git a/src/http_fetch.c b/src/http_fetch.c
index 5d03dc7c5..f21d77c0a 100644
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -20,6 +20,7 @@
 #include <haproxy/base64.h>
 #include <haproxy/chunk.h>
 #include <haproxy/h1.h>
+#include <haproxy/h1_htx.h>
 #include <haproxy/http.h>
 #include <haproxy/htx.h>
 #include <haproxy/pool.h>
@@ -33,7 +34,6 @@
 #include <proto/channel.h>
 #include <proto/connection.h>
 #include <proto/http_fetch.h>
-#include <proto/h1_htx.h>
 #include <proto/http_htx.h>
 #include <proto/log.h>
 #include <proto/obj_type.h>
diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 0e1d59ce6..6473e725c 100644
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -14,6 +14,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/fcgi.h>
 #include <haproxy/h1.h>
+#include <haproxy/h1_htx.h>
 #include <haproxy/htx.h>
 #include <import/ist.h>
 #include <haproxy/list.h>
@@ -25,7 +26,6 @@
 
 #include <proto/connection.h>
 #include <proto/fcgi-app.h>
-#include <proto/h1_htx.h>
 #include <proto/http_htx.h>
 #include <proto/log.h>
 #include <proto/session.h>
diff --git a/src/mux_h1.c b/src/mux_h1.c
index f2ba33844..e0d856fc9 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -13,6 +13,7 @@
 #include <haproxy/istbuf.h>
 #include <common/cfgparse.h>
 #include <haproxy/h1.h>
+#include <haproxy/h1_htx.h>
 #include <haproxy/h2.h>
 #include <haproxy/htx.h>
 
@@ -23,7 +24,6 @@
 #include <types/session.h>
 
 #include <proto/connection.h>
-#include <proto/h1_htx.h>
 #include <proto/http_htx.h>
 #include <proto/log.h>
 #include <proto/session.h>