From: Christopher Faulet <cfaulet@haproxy.com>
Date: Fri, 24 Jul 2026 09:02:38 +0000 (+0200)
Subject: REORG: h1-htx: Move h1 headers map in h1-htx
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=73ee6a59b091abfe4fad62ce5b081505a83e522d;p=thirdparty%2Fhaproxy.git

REORG: h1-htx: Move h1 headers map in h1-htx

The map used to adjust the H1 headers case was moved in h1-htx part. For
this purpose h1_htx-t.h file was added and h1_hdrs_map and h1_hdr_entry
structures were moved into this file.

This commit is mandatory for the next fix.
---

diff --git a/include/haproxy/h1_htx-t.h b/include/haproxy/h1_htx-t.h
new file mode 100644
index 000000000..8e6f79037
--- /dev/null
+++ b/include/haproxy/h1_htx-t.h
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+
+#ifndef _HAPROXY_H1_HTX_T_H
+#define _HAPROXY_H1_HTX_T_H
+
+#include <import/ist.h>
+#include <import/ebpttree.h>
+
+/* Map of headers used to convert outgoing headers */
+struct h1_hdrs_map {
+	char *name;
+	struct eb_root map;
+};
+
+/* An entry in a headers map */
+struct h1_hdr_entry  {
+	struct ist name;
+	struct ebpt_node node;
+};
+
+#endif /* _HAPROXY_H1_HTX_T_H */
diff --git a/include/haproxy/h1_htx.h b/include/haproxy/h1_htx.h
index 5be56cdd8..74e6fcb1b 100644
--- a/include/haproxy/h1_htx.h
+++ b/include/haproxy/h1_htx.h
@@ -27,6 +27,7 @@
 #include <haproxy/api-t.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/h1.h>
+#include <haproxy/h1_htx-t.h>
 #include <haproxy/htx.h>
 
 int h1_parse_msg_hdrs(struct h1m *h1m, union h1_sl *h1sl, struct htx *dsthtx,
diff --git a/src/mux_h1.c b/src/mux_h1.c
index 854460f90..c42ce6d3e 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -80,18 +80,6 @@ struct h1s {
 	char ws_key[25];       /* websocket handshake key */
 };
 
-/* Map of headers used to convert outgoing headers */
-struct h1_hdrs_map {
-	char *name;
-	struct eb_root map;
-};
-
-/* An entry in a headers map */
-struct h1_hdr_entry  {
-	struct ist name;
-	struct ebpt_node node;
-};
-
 /* Declare the headers map */
 static struct h1_hdrs_map hdrs_map = { .name = NULL, .map  = EB_ROOT };
 static int accept_payload_with_any_method = 0;