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

There was no include file. This one still includes types/proxy.h.
---
 include/{proto => haproxy}/http_rules.h | 8 ++++----
 src/cache.c                             | 2 +-
 src/cfgparse-listen.c                   | 2 +-
 src/cfgparse.c                          | 2 +-
 src/dns.c                               | 2 +-
 src/flt_spoe.c                          | 2 +-
 src/haproxy.c                           | 2 +-
 src/hlua.c                              | 2 +-
 src/http_act.c                          | 2 +-
 src/http_rules.c                        | 2 +-
 src/proto_tcp.c                         | 2 +-
 src/queue.c                             | 2 +-
 src/ssl_sock.c                          | 2 +-
 src/stick_table.c                       | 2 +-
 src/stream.c                            | 2 +-
 src/vars.c                              | 2 +-
 16 files changed, 19 insertions(+), 19 deletions(-)
 rename include/{proto => haproxy}/http_rules.h (94%)

diff --git a/include/proto/http_rules.h b/include/haproxy/http_rules.h
similarity index 94%
rename from include/proto/http_rules.h
rename to include/haproxy/http_rules.h
index fd2db0108..cc480f8bd 100644
--- a/include/proto/http_rules.h
+++ b/include/haproxy/http_rules.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/http_rules.h
+ * include/haproxy/http_rules.h
  * This file contains "http" rules definitions
  *
  * Copyright (C) 2000-2018 Willy Tarreau - w@1wt.eu
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_HTTP_RULES_H
-#define _PROTO_HTTP_RULES_H
+#ifndef _HAPROXY_HTTP_RULES_H
+#define _HAPROXY_HTTP_RULES_H
 
 #include <haproxy/api.h>
 #include <haproxy/list.h>
@@ -52,7 +52,7 @@ static inline void http_after_res_keywords_register(struct action_kw_list *kw_li
 	LIST_ADDQ(&http_after_res_keywords.list, &kw_list->list);
 }
 
-#endif /* _PROTO_HTTP_RULES_H */
+#endif /* _HAPROXY_HTTP_RULES_H */
 
 /*
  * Local variables:
diff --git a/src/cache.c b/src/cache.c
index ad34a9d0b..707a01161 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -13,6 +13,7 @@
 #include <haproxy/action-t.h>
 #include <haproxy/api.h>
 #include <haproxy/http_htx.h>
+#include <haproxy/http_rules.h>
 #include <haproxy/shctx.h>
 #include <import/eb32tree.h>
 #include <import/sha1.h>
@@ -25,7 +26,6 @@
 #include <proto/cli.h>
 #include <proto/proxy.h>
 #include <proto/filters.h>
-#include <proto/http_rules.h>
 #include <proto/http_ana.h>
 #include <proto/log.h>
 #include <proto/stream.h>
diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c
index d72d83af9..e4bad66a4 100644
--- a/src/cfgparse-listen.c
+++ b/src/cfgparse-listen.c
@@ -17,12 +17,12 @@
 #include <haproxy/capture-t.h>
 #include <haproxy/compression-t.h>
 #include <haproxy/http_htx.h>
+#include <haproxy/http_rules.h>
 #include <types/stats.h>
 
 #include <proto/acl.h>
 #include <proto/checks.h>
 #include <proto/connection.h>
-#include <proto/http_rules.h>
 #include <proto/listener.h>
 #include <haproxy/protocol.h>
 #include <proto/proxy.h>
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 621883a40..119a5edc6 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -42,6 +42,7 @@
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
 #include <haproxy/frontend.h>
+#include <haproxy/http_rules.h>
 #include <haproxy/mailers-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/pool.h>
@@ -62,7 +63,6 @@
 #include <proto/checks.h>
 #include <proto/stats.h>
 #include <proto/filters.h>
-#include <proto/http_rules.h>
 #include <proto/lb_chash.h>
 #include <proto/lb_fas.h>
 #include <proto/lb_fwlc.h>
diff --git a/src/dns.c b/src/dns.c
index c1fe1e29b..32c4efa36 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -24,6 +24,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
+#include <haproxy/http_rules.h>
 #include <haproxy/time.h>
 #include <haproxy/ticks.h>
 #include <haproxy/net_helper.h>
@@ -38,7 +39,6 @@
 #include <proto/checks.h>
 #include <haproxy/fd.h>
 #include <proto/http_ana.h>
-#include <proto/http_rules.h>
 #include <proto/log.h>
 #include <proto/sample.h>
 #include <proto/server.h>
diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index 7fe44cf48..9f69f9f2e 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -16,6 +16,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/frontend.h>
+#include <haproxy/http_rules.h>
 #include <haproxy/thread.h>
 #include <haproxy/pool.h>
 #include <haproxy/time.h>
@@ -29,7 +30,6 @@
 #include <proto/backend.h>
 #include <proto/filters.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/http_rules.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
 #include <proto/proxy.h>
diff --git a/src/haproxy.c b/src/haproxy.c
index 37e117659..1b5de8332 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -89,6 +89,7 @@
 #include <haproxy/dynbuf.h>
 #include <haproxy/errors.h>
 #include <haproxy/hlua.h>
+#include <haproxy/http_rules.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
 #include <haproxy/namespace.h>
@@ -117,7 +118,6 @@
 #include <proto/connection.h>
 #include <haproxy/fd.h>
 #include <proto/filters.h>
-#include <proto/http_rules.h>
 #include <proto/listener.h>
 #include <proto/log.h>
 #include <proto/mworker.h>
diff --git a/src/hlua.c b/src/hlua.c
index a795935f0..3f491bd92 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -32,6 +32,7 @@
 #include <haproxy/h1.h>
 #include <haproxy/hlua.h>
 #include <haproxy/hlua_fcn.h>
+#include <haproxy/http_rules.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/tools.h>
 
@@ -46,7 +47,6 @@
 #include <proto/connection.h>
 #include <proto/stats.h>
 #include <proto/http_fetch.h>
-#include <proto/http_rules.h>
 #include <proto/map.h>
 #include <proto/queue.h>
 #include <proto/pattern.h>
diff --git a/src/http_act.c b/src/http_act.c
index 51bb1a348..d2babb1bc 100644
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -22,6 +22,7 @@
 #include <haproxy/chunk.h>
 #include <haproxy/http.h>
 #include <haproxy/http_htx.h>
+#include <haproxy/http_rules.h>
 #include <haproxy/pool.h>
 #include <haproxy/regex.h>
 #include <haproxy/tools.h>
@@ -33,7 +34,6 @@
 
 #include <proto/acl.h>
 #include <haproxy/arg.h>
-#include <proto/http_rules.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
 #include <proto/pattern.h>
diff --git a/src/http_rules.c b/src/http_rules.c
index 758e6192a..2ec91d9d5 100644
--- a/src/http_rules.c
+++ b/src/http_rules.c
@@ -21,6 +21,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/chunk.h>
 #include <haproxy/http.h>
+#include <haproxy/http_rules.h>
 #include <haproxy/pool.h>
 #include <haproxy/tools.h>
 #include <haproxy/version.h>
@@ -30,7 +31,6 @@
 
 #include <proto/acl.h>
 #include <haproxy/arg.h>
-#include <proto/http_rules.h>
 #include <proto/http_ana.h>
 #include <proto/sample.h>
 
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 5a475b871..88da33138 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -33,6 +33,7 @@
 #include <haproxy/action-t.h>
 #include <haproxy/api.h>
 #include <haproxy/errors.h>
+#include <haproxy/http_rules.h>
 #include <haproxy/list.h>
 #include <haproxy/tools.h>
 #include <haproxy/namespace.h>
@@ -45,7 +46,6 @@
 #include <proto/channel.h>
 #include <proto/connection.h>
 #include <haproxy/fd.h>
-#include <proto/http_rules.h>
 #include <proto/listener.h>
 #include <proto/log.h>
 #include <haproxy/port_range.h>
diff --git a/src/queue.c b/src/queue.c
index 43a21b1e1..83863990d 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -70,12 +70,12 @@
  */
 
 #include <haproxy/api.h>
+#include <haproxy/http_rules.h>
 #include <haproxy/pool.h>
 #include <haproxy/time.h>
 #include <haproxy/thread.h>
 #include <import/eb32tree.h>
 
-#include <proto/http_rules.h>
 #include <proto/http_ana.h>
 #include <proto/queue.h>
 #include <proto/sample.h>
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index d04de1c6b..6f0f399c1 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -48,6 +48,7 @@
 #include <haproxy/chunk.h>
 #include <haproxy/errors.h>
 #include <haproxy/frontend.h>
+#include <haproxy/http_rules.h>
 #include <haproxy/openssl-compat.h>
 #include <haproxy/shctx.h>
 #include <haproxy/tools.h>
@@ -71,7 +72,6 @@
 #include <proto/cli.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/http_rules.h>
 #include <proto/listener.h>
 #include <proto/pattern.h>
 #include <proto/proto_tcp.h>
diff --git a/src/stick_table.c b/src/stick_table.c
index c2e1e852b..011a6a314 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -16,6 +16,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
+#include <haproxy/http_rules.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
 #include <haproxy/net_helper.h>
@@ -31,7 +32,6 @@
 
 #include <haproxy/arg.h>
 #include <proto/cli.h>
-#include <proto/http_rules.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
 #include <proto/proto_tcp.h>
diff --git a/src/stream.c b/src/stream.c
index 57a0d91c2..afbf83a86 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -23,6 +23,7 @@
 #include <haproxy/dynbuf.h>
 #include <haproxy/frontend.h>
 #include <haproxy/hlua.h>
+#include <haproxy/http_rules.h>
 #include <haproxy/istbuf.h>
 #include <haproxy/thread.h>
 #include <haproxy/htx.h>
@@ -46,7 +47,6 @@
 #include <haproxy/fd.h>
 #include <proto/filters.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/http_rules.h>
 #include <proto/listener.h>
 #include <proto/log.h>
 #include <proto/session.h>
diff --git a/src/vars.c b/src/vars.c
index de55f148b..8cc4c4893 100644
--- a/src/vars.c
+++ b/src/vars.c
@@ -3,12 +3,12 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/http.h>
+#include <haproxy/http_rules.h>
 #include <haproxy/list.h>
 
 #include <types/vars.h>
 
 #include <haproxy/arg.h>
-#include <proto/http_rules.h>
 #include <proto/http_ana.h>
 #include <proto/sample.h>
 #include <proto/stream.h>