]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
REORG: include: move http_rules.h to haproxy/http_rules.h
authorWilly Tarreau <w@1wt.eu>
Thu, 4 Jun 2020 09:40:28 +0000 (11:40 +0200)
committerWilly Tarreau <w@1wt.eu>
Thu, 11 Jun 2020 08:18:57 +0000 (10:18 +0200)
There was no include file. This one still includes types/proxy.h.

16 files changed:
include/haproxy/http_rules.h [moved from include/proto/http_rules.h with 94% similarity]
src/cache.c
src/cfgparse-listen.c
src/cfgparse.c
src/dns.c
src/flt_spoe.c
src/haproxy.c
src/hlua.c
src/http_act.c
src/http_rules.c
src/proto_tcp.c
src/queue.c
src/ssl_sock.c
src/stick_table.c
src/stream.c
src/vars.c

similarity index 94%
rename from include/proto/http_rules.h
rename to include/haproxy/http_rules.h
index fd2db010896683305d548834184062dd4662fbd4..cc480f8bd3358b2027ab5dee8f7de324ff380e72 100644 (file)
@@ -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:
index ad34a9d0b2716778f79defde4605cc9c1211f3bb..707a011617367b76eaf748585be79f4455201d48 100644 (file)
@@ -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>
index d72d83af9a8a1cf04e1dac57f7e392a729fe837b..e4bad66a4f28f521679c1ccca4d567ccf33b062a 100644 (file)
 #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>
index 621883a4094b569ef3790ef51d3c518f37496be5..119a5edc676c2a887f2f6044ed66f6dcdeb33c30 100644 (file)
@@ -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>
index c1fe1e29b6c1115732338f9b7c356367d737962a..32c4efa36446c251dde9ffb1c87b95268d537fac 100644 (file)
--- 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>
index 7fe44cf48c5d910eded54af5e396cfcb638dbb40..9f69f9f2e04151d1da6e9536b0e7e24b4a72db16 100644 (file)
@@ -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>
index 37e1176599adc7dc3d8073a4aec59653f889370d..1b5de8332cb9ee32f66bc61ab23ba49ef7e06824 100644 (file)
@@ -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>
 #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>
index a795935f0ae94d92ac4a0665d9ff032c058a9c0e..3f491bd92ac454f1503a4c647d7cf45cfee2fe3b 100644 (file)
@@ -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>
index 51bb1a34859ef035d20e64aac53dd9d1ef1f9cde..d2babb1bce8901636900ac13b6cb81d88c14b84f 100644 (file)
@@ -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>
index 758e6192ac01ba20bc840e8ded64ce7ff4b0e07b..2ec91d9d5e0dbedfea78a4b7182bb95bcc8c0a22 100644 (file)
@@ -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>
 
index 5a475b8714144136e5a30b3d583499d9986ee175..88da3313895461e2066d0f3dd92234e206f74914 100644 (file)
@@ -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>
index 43a21b1e1a7ad51ee471f255599fdcee0d6be107..83863990dbc1b60e270a5a34cdcda55a2d0a5cfb 100644 (file)
  */
 
 #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>
index d04de1c6b943a5a915c4e266285edd6594b3c55e..6f0f399c1820ad691109a2cf7bed6b6649b63344 100644 (file)
@@ -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>
index c2e1e852bf03347e8cd0206dd94aa15e4a2be2bf..011a6a314b0b11539fb2b1bcb98825b59af729f4 100644 (file)
@@ -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>
index 57a0d91c2b04407c6118a9629eed268865a566be..afbf83a865eabd1d5e628720ed3befb61c08cf47 100644 (file)
@@ -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>
index de55f148ba73e54fa53617d08f49901b148a6a1a..8cc4c4893bcde064698c6716e78a767192afed71 100644 (file)
@@ -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>