]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
REORG: include: move http_ana.h to haproxy/http_ana{,-t}.h
authorWilly Tarreau <w@1wt.eu>
Thu, 4 Jun 2020 19:21:03 +0000 (21:21 +0200)
committerWilly Tarreau <w@1wt.eu>
Thu, 11 Jun 2020 08:18:58 +0000 (10:18 +0200)
It was moved without any change, however many callers didn't need it at
all. This was a consequence of the split of proto_http.c into several
parts that resulted in many locations to still reference it.

32 files changed:
contrib/debug/flags.c
include/haproxy/hlua-t.h
include/haproxy/http_ana-t.h [moved from include/types/http_ana.h with 97% similarity]
include/haproxy/http_ana.h [moved from include/proto/http_ana.h with 94% similarity]
include/proto/filters.h
include/types/stream.h
src/51d.c
src/backend.c
src/cache.c
src/cfgparse.c
src/da.c
src/dns.c
src/filters.c
src/flt_http_comp.c
src/flt_spoe.c
src/flt_trace.c
src/frontend.c
src/haproxy.c
src/hlua.c
src/http_act.c
src/http_ana.c
src/http_fetch.c
src/http_rules.c
src/payload.c
src/proto_tcp.c
src/proxy.c
src/queue.c
src/ssl_sock.c
src/stick_table.c
src/stream.c
src/vars.c
src/wurfl.c

index 905cc2f2a0d9b0b7d0851ce205b7260fc326db91..15136a3b47b10e11d2cd056f0d40972c4a9defaa 100644 (file)
@@ -3,7 +3,7 @@
 
 #include <haproxy/channel-t.h>
 #include <haproxy/connection-t.h>
-#include <types/http_ana.h>
+#include <haproxy/http_ana-t.h>
 #include <types/stream.h>
 #include <haproxy/stream_interface-t.h>
 #include <haproxy/task-t.h>
index 0f992236ee0458961cfb5405ef4e75da5b0a19d0..f363326a817a0ab20275c91cd56aaf409cd3ca89 100644 (file)
@@ -33,7 +33,6 @@
 #include <haproxy/regex-t.h>
 #include <haproxy/xref-t.h>
 
-#include <types/http_ana.h>
 #include <types/proxy.h>
 #include <types/server.h>
 #include <haproxy/stick_table-t.h>
similarity index 97%
rename from include/types/http_ana.h
rename to include/haproxy/http_ana-t.h
index 6ebe772bfe2d901ddb2cf57acffafb40b44b3d2e..16119249a9460aaa5a0e101207d34587d764de9b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/types/http_ana.h
+ * include/haproxy/http_ana-t.h
  * This file contains HTTP protocol definitions.
  *
  * Copyright (C) 2000-2011 Willy Tarreau - w@1wt.eu
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_PROTO_HTTP_H
-#define _TYPES_PROTO_HTTP_H
+#ifndef _HAPROXY_PROTO_HTTP_T_H
+#define _HAPROXY_PROTO_HTTP_T_H
 
 #include <haproxy/channel-t.h>
-#include <haproxy/api-t.h>
 #include <haproxy/http-t.h>
-#include <haproxy/http_htx-t.h>
+#include <haproxy/api-t.h>
 
 /* These are the flags that are found in txn->flags */
 
@@ -186,9 +185,7 @@ struct http_txn {
        struct http_auth_data auth;     /* HTTP auth data */
 };
 
-extern struct pool_head *pool_head_http_txn;
-
-#endif /* _TYPES_PROTO_HTTP_H */
+#endif /* _HAPROXY_PROTO_HTTP_T_H */
 
 /*
  * Local variables:
similarity index 94%
rename from include/proto/http_ana.h
rename to include/haproxy/http_ana.h
index 8648865ddeddcec0bf2e6c1920cd1d1757d65355..6bf4a5a2bd06b83218776ceb19d220432dadbe57 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/proto/http_ana.h
+ * include/haproxy/http_ana.h
  * This file contains HTTP protocol definitions.
  *
  * Copyright (C) 2000-2011 Willy Tarreau - w@1wt.eu
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_PROTO_HTTP_H
-#define _PROTO_PROTO_HTTP_H
+#ifndef _HAPROXY_PROTO_HTTP_H
+#define _HAPROXY_PROTO_HTTP_H
 
 #include <haproxy/api.h>
 #include <haproxy/channel-t.h>
-#include <haproxy/htx.h>
-#include <types/http_ana.h>
+#include <haproxy/http_ana-t.h>
+#include <haproxy/htx-t.h>
 #include <types/stream.h>
 
 extern struct pool_head *pool_head_uniqueid;
+extern struct pool_head *pool_head_http_txn;
 
 int http_wait_for_request(struct stream *s, struct channel *req, int an_bit);
 int http_process_req_common(struct stream *s, struct channel *req, int an_bit, struct proxy *px);
@@ -78,7 +79,7 @@ static inline const char *h1_msg_state_str(enum h1_state msg_state)
        }
 }
 
-#endif /* _PROTO_PROTO_HTTP_H */
+#endif /* _HAPROXY_PROTO_HTTP_H */
 
 /*
  * Local variables:
index 9e8cc74f886032901d7cef8d12563d56a3b005be..4b8876ea8196b896e4f3fe2052a656b634ded8cd 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <haproxy/channel.h>
 #include <types/filters.h>
-#include <types/http_ana.h>
+#include <haproxy/http_ana-t.h>
 #include <types/proxy.h>
 #include <types/stream.h>
 
index 2a5fb77f4e88f0474da808c04c600f4422547563..99dfd02ecc3ce467e5c5331ff207ac98a0c80a49 100644 (file)
@@ -32,6 +32,7 @@
 #include <haproxy/channel-t.h>
 #include <haproxy/dynbuf-t.h>
 #include <haproxy/hlua-t.h>
+#include <haproxy/http_ana-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/session-t.h>
@@ -39,7 +40,6 @@
 #include <haproxy/vars-t.h>
 
 #include <types/filters.h>
-#include <types/http_ana.h>
 #include <types/proxy.h>
 #include <types/queue.h>
 #include <types/server.h>
index 3bdc5bf612fb47be8bdac5d1550611e5185a8dca..37124ea37f0b3e0f706f0894d7e26ef8bfbe6911 100644 (file)
--- a/src/51d.c
+++ b/src/51d.c
@@ -5,13 +5,13 @@
 #include <haproxy/chunk.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/errors.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/thread.h>
 #include <haproxy/global.h>
 #include <haproxy/arg.h>
 #include <proto/log.h>
-#include <proto/http_ana.h>
 #include <haproxy/sample.h>
 #include <import/xxhash.h>
 #include <import/lru.h>
index d4805d74105dc459f202928a7e7f677f4054d328..f79ac18e54f067408ebecd13b996ddf39049f2b3 100644 (file)
@@ -26,6 +26,7 @@
 #include <haproxy/frontend.h>
 #include <haproxy/hash.h>
 #include <haproxy/http.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/lb_chash.h>
@@ -49,7 +50,6 @@
 #include <proto/backend.h>
 #include <proto/log.h>
 #include <haproxy/protocol.h>
-#include <proto/http_ana.h>
 #include <haproxy/proto_tcp.h>
 #include <proto/proxy.h>
 #include <proto/queue.h>
index 80bc545d4db1b22b737b788a292183f2134c345a..36c54a880d13b8afc3ed19ead24352c08ceccf05 100644 (file)
@@ -14,6 +14,7 @@
 #include <haproxy/api.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/shctx.h>
@@ -26,7 +27,6 @@
 
 #include <proto/proxy.h>
 #include <proto/filters.h>
-#include <proto/http_ana.h>
 #include <proto/log.h>
 #include <proto/stream.h>
 
index 15f768eecf0c1e43475eb9a9108e30e130fb37fe..e5cac8b114789273b5913a305517a0a56c4bbad7 100644 (file)
@@ -46,6 +46,7 @@
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
 #include <haproxy/frontend.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/lb_chash.h>
 #include <haproxy/lb_fas.h>
@@ -73,7 +74,6 @@
 #include <proto/filters.h>
 #include <proto/log.h>
 #include <haproxy/protocol.h>
-#include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <haproxy/peers.h>
 #include <haproxy/sample.h>
index ab36fa932d2fa80ab54498307db2d0b622d4afc0..1d62ade4a096664b12782a3a89f990bc9028bc39 100644 (file)
--- a/src/da.c
+++ b/src/da.c
@@ -4,12 +4,13 @@
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
 #include <haproxy/http.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
+#include <haproxy/htx.h>
 #include <haproxy/global.h>
 #include <haproxy/arg.h>
 #include <proto/log.h>
-#include <proto/http_ana.h>
 #include <haproxy/sample.h>
 #include <dac.h>
 
index 54c078009f0201d869de572621720c89b40ce4b1..7658f6f846f0515b549e640cc9885f80fa6a6906 100644 (file)
--- a/src/dns.c
+++ b/src/dns.c
@@ -41,7 +41,6 @@
 #include <haproxy/global.h>
 
 #include <haproxy/fd.h>
-#include <proto/http_ana.h>
 #include <proto/log.h>
 #include <proto/server.h>
 #include <haproxy/proto_udp.h>
index de5d9f276911f581a722ceb146e91681b0eb910a..130f5d71a402ce57a5b66773e5789171f234f938 100644 (file)
@@ -15,6 +15,7 @@
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
 #include <haproxy/flt_http_comp.h>
+#include <haproxy/http_ana-t.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/namespace.h>
 #include <haproxy/tools.h>
 
 #include <types/filters.h>
-#include <types/http_ana.h>
 
 #include <haproxy/compression.h>
 #include <proto/filters.h>
-#include <proto/http_ana.h>
+#include <haproxy/http_ana.h>
 #include <proto/stream.h>
 
 #define TRACE_SOURCE &trace_strm
index 5ab6a01c78815ff9707dfd50c2fd00049e6f87f5..0fb213d08f3cbb25b471778059d676b6a63a3da9 100644 (file)
@@ -14,6 +14,7 @@
 #include <haproxy/compression.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/http.h>
+#include <haproxy/http_ana-t.h>
 #include <haproxy/http_htx.h>
 #include <common/cfgparse.h>
 #include <haproxy/htx.h>
@@ -25,7 +26,6 @@
 #include <types/proxy.h>
 
 #include <proto/filters.h>
-#include <proto/http_ana.h>
 #include <proto/stream.h>
 
 const char *http_comp_flt_id = "compression filter";
index d483ba53ad187ffe87080745b9e75923dca16338..9e9eaeb8f4dad52cee48ff45590415200b5ac28f 100644 (file)
@@ -38,7 +38,6 @@
 #include <proto/filters.h>
 #include <haproxy/freq_ctr.h>
 #include <proto/log.h>
-#include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <proto/spoe.h>
 #include <proto/stream.h>
index aaf63d37f92248a72b0abf417848fee569ce9bf3..125401a38c55f077187ba60939a27723f0dada01 100644 (file)
@@ -14,6 +14,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/channel-t.h>
+#include <haproxy/http_ana-t.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/tools.h>
@@ -26,7 +27,6 @@
 
 #include <proto/filters.h>
 #include <proto/log.h>
-#include <proto/http_ana.h>
 #include <proto/stream.h>
 
 const char *trace_flt_id = "trace filter";
index 63ab35699a768eecb2128df86e2497ef90efe6a9..09adbea1558c0a67332a24330f1ff6c0a0569afb 100644 (file)
@@ -26,6 +26,7 @@
 #include <haproxy/api.h>
 #include <haproxy/chunk.h>
 #include <haproxy/frontend.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/sample.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
@@ -38,7 +39,6 @@
 #include <haproxy/fd.h>
 #include <proto/log.h>
 #include <haproxy/proto_tcp.h>
-#include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <proto/stream.h>
 
index 44e4ff32b0ce4b39533e57f63f97f352afdb2394..6370d8e59f14bb40d7b1cc357e22650e23729c24 100644 (file)
 #include <proto/filters.h>
 #include <proto/log.h>
 #include <haproxy/protocol.h>
-#include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <proto/queue.h>
 #include <proto/server.h>
index fbca16f64e87823f922ca27c5af3549687813e30..afff59a02ea30c0af8ad0a8980e725592efb0edd 100644 (file)
@@ -36,6 +36,7 @@
 #include <haproxy/h1.h>
 #include <haproxy/hlua.h>
 #include <haproxy/hlua_fcn.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/map.h>
@@ -55,7 +56,6 @@
 
 #include <haproxy/arg.h>
 #include <proto/queue.h>
-#include <proto/http_ana.h>
 #include <proto/server.h>
 #include <proto/stream.h>
 
index 4c283283d68ff045b224b60da9d6b2b25c732d3e..06ab3c271c0fa7a2848eb4c7a8d03a6a0ca6c532 100644 (file)
@@ -23,6 +23,7 @@
 #include <haproxy/chunk.h>
 #include <haproxy/global.h>
 #include <haproxy/http.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/pattern.h>
@@ -38,7 +39,6 @@
 
 #include <haproxy/arg.h>
 #include <proto/log.h>
-#include <proto/http_ana.h>
 
 /* Release memory allocated by most of HTTP actions. Concretly, it releases
  * <arg.http>.
index ee43a69e7b790c54c928a36322290e66803ed638..6e15d67303cfa9ed8ab0a5254b4898203e50ed67 100644 (file)
@@ -18,6 +18,7 @@
 #include <haproxy/check.h>
 #include <haproxy/connection.h>
 #include <haproxy/http.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/net_helper.h>
@@ -31,7 +32,6 @@
 
 #include <proto/filters.h>
 #include <proto/log.h>
-#include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
 #include <proto/stream.h>
index 7209fc669c5b1f8a531189bd08d328f73eeb32d9..65fbe877ec2fdcab2a74b6e98f5238c25fd64d5c 100644 (file)
@@ -26,6 +26,7 @@
 #include <haproxy/h1.h>
 #include <haproxy/h1_htx.h>
 #include <haproxy/http.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
@@ -37,7 +38,6 @@
 
 #include <haproxy/arg.h>
 #include <proto/log.h>
-#include <proto/http_ana.h>
 #include <proto/stream.h>
 
 
index 6864e5ea3d5fbbdcf896333c0e21749646e88a2d..40ffb713519d08ad77a79bda694da70390d8a5aa 100644 (file)
@@ -30,7 +30,6 @@
 #include <haproxy/capture-t.h>
 
 #include <haproxy/arg.h>
-#include <proto/http_ana.h>
 #include <haproxy/sample.h>
 
 
index c84a124f897e1edc0286cb2117a33a16efb5eb9a..d9b31072b05fc2ce3cd06d1b392f9af9036f9d84 100644 (file)
@@ -23,7 +23,6 @@
 #include <haproxy/htx.h>
 #include <haproxy/arg.h>
 #include <haproxy/sample.h>
-#include <proto/http_ana.h>
 
 
 /************************************************************************/
index e25bbdb844058b0354e098d1a4db65b734f5748a..b25779ccd4cee8f612f838e0c4617dcfcbb12a70 100644 (file)
@@ -50,7 +50,6 @@
 #include <proto/log.h>
 #include <haproxy/port_range.h>
 #include <haproxy/protocol.h>
-#include <proto/http_ana.h>
 #include <haproxy/proto_tcp.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
index 11f340d0a5fa77206cda7a7a0e38bb698f4675d5..803f1868ae14e0cd2fa55330a4208aaaa5899446 100644 (file)
@@ -23,6 +23,7 @@
 #include <haproxy/cli.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/listener.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/peers.h>
@@ -42,7 +43,6 @@
 #include <proto/filters.h>
 #include <proto/log.h>
 #include <haproxy/proto_tcp.h>
-#include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
 #include <haproxy/signal.h>
index 3b5d0ef4c7573da2a1777824060aed54541d8cda..6e99769664fe5040db322492d30452f57559e425 100644 (file)
@@ -80,7 +80,6 @@
 #include <haproxy/thread.h>
 #include <import/eb32tree.h>
 
-#include <proto/http_ana.h>
 #include <proto/queue.h>
 #include <proto/server.h>
 #include <proto/stream.h>
index 6ce493a6070c9aabc2a57418a230a5cfe3da0096..a586b62553f00157b28d8ce4ed22bd10b5616d8e 100644 (file)
@@ -76,7 +76,6 @@
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
 #include <haproxy/proto_tcp.h>
-#include <proto/http_ana.h>
 #include <proto/server.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
index 6bf6cd9a92f6a3fc9acf78900d590279e6c03f2f..3a8d62f4490be75ab99d3843d34dda43eb552f01 100644 (file)
@@ -35,7 +35,6 @@
 
 #include <haproxy/arg.h>
 #include <proto/log.h>
-#include <proto/http_ana.h>
 #include <haproxy/proto_tcp.h>
 #include <proto/proxy.h>
 #include <haproxy/sample.h>
index 6ec17947f0895bff471fb41fa3deda0c773230b6..010509fb5cc9eee66dc8f7e64cee2304c056992c 100644 (file)
@@ -30,6 +30,7 @@
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/hlua.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/istbuf.h>
 #include <haproxy/thread.h>
@@ -53,7 +54,6 @@
 #include <proto/log.h>
 #include <proto/stream.h>
 #include <haproxy/pipe.h>
-#include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <proto/queue.h>
 #include <proto/server.h>
index 4a3b4574ff62af37018b4648dbf2116fc1f6c09c..b26d60f2b41c71af435d51a78fd471c3afccb950 100644 (file)
@@ -11,7 +11,6 @@
 #include <haproxy/vars.h>
 
 #include <haproxy/arg.h>
-#include <proto/http_ana.h>
 #include <proto/stream.h>
 
 /* This contains a pool of struct vars */
index 01cce0d8c46bc8f243d37a71892dbc404b5d467b..f7992e53c80edcfba8272065c62b92294b9ddd90 100644 (file)
@@ -7,11 +7,11 @@
 #include <haproxy/chunk.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
+#include <haproxy/http_ana.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/arg.h>
 #include <proto/log.h>
-#include <proto/http_ana.h>
 #include <haproxy/sample.h>
 #include <import/ebsttree.h>
 #include <import/ebmbtree.h>