REORG: include: move http_fetch.h to haproxy/http_fetch.h

There's no type file for this trivial one. The unneeded dependency on
htx.h was dropped.

diff --git a/include/proto/http_fetch.h b/include/haproxy/http_fetch.h
similarity index 89%
rename from include/proto/http_fetch.h
rename to include/haproxy/http_fetch.h
index 2c844355b7a9629bb1db34362dc7f46d95e30fd4..549d77329ef6e244ef0cb7930992663352f0fc85 100644 (file)
--- a/include/proto/http_fetch.h
+++ b/include/haproxy/http_fetch.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/http_fetch.h
+ * include/haproxy/http_fetch.h
  * This file contains the minimally required http sample fetch declarations.
  *
  * Copyright (C) 2000-2018 Willy Tarreau - w@1wt.eu
@@ -19,21 +19,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_HTTP_FETCH_H
-#define _PROTO_HTTP_FETCH_H
+#ifndef _HAPROXY_HTTP_FETCH_H
+#define _HAPROXY_HTTP_FETCH_H
 
+#include <haproxy/arg-t.h>
 #include <haproxy/api.h>
 #include <haproxy/check-t.h>
-#include <haproxy/htx.h>
-#include <haproxy/arg-t.h>
-#include <types/channel.h>
 #include <haproxy/sample-t.h>
+#include <types/channel.h>
 
 struct htx *smp_prefetch_htx(struct sample *smp, struct channel *chn, struct check *check, int vol);
 int val_hdr(struct arg *arg, char **err_msg);
 
-
-#endif /* _PROTO_HTTP_FETCH_H */
+#endif /* _HAPROXY_HTTP_FETCH_H */
 
 /*
  * Local variables:

diff --git a/src/51d.c b/src/51d.c
index 529a8baa0a72df4faf7cee7462d536a95113a515..3bdc5bf612fb47be8bdac5d1550611e5185a8dca 100644 (file)
--- a/src/51d.c
+++ b/src/51d.c
@@ -5,11 +5,11 @@
 #include <haproxy/chunk.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/errors.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/http_fetch.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
 #include <haproxy/sample.h>

diff --git a/src/da.c b/src/da.c
index 20afdfc6789dc797172e646e778dfeee0f374011..ab36fa932d2fa80ab54498307db2d0b622d4afc0 100644 (file)
--- a/src/da.c
+++ b/src/da.c
@@ -4,10 +4,10 @@
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
 #include <haproxy/http.h>
+#include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/global.h>
 #include <haproxy/arg.h>
-#include <proto/http_fetch.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
 #include <haproxy/sample.h>

diff --git a/src/fcgi-app.c b/src/fcgi-app.c
index 10a8de5428008a72b25f1e210099e5be44b5d1fc..68d0efe2ea6b661fe8534d74cb4b3d084b8b061d 100644 (file)
--- a/src/fcgi-app.c
+++ b/src/fcgi-app.c
@@ -14,6 +14,7 @@
 #include <haproxy/chunk.h>
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
+#include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
@@ -24,7 +25,6 @@
 #include <proto/acl.h>
 #include <proto/fcgi-app.h>
 #include <proto/filters.h>
-#include <proto/http_fetch.h>
 #include <proto/log.h>
 #include <proto/proxy.h>
 #include <proto/server.h>

diff --git a/src/hlua.c b/src/hlua.c
index 0b75bf723f00288b1d9dedb0c5dbd7af2a15d600..b9339d421491aebc81dbc5c975cdc0b0a50197d7 100644 (file)
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -33,6 +33,7 @@
 #include <haproxy/h1.h>
 #include <haproxy/hlua.h>
 #include <haproxy/hlua_fcn.h>
+#include <haproxy/http_fetch.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/map.h>
 #include <haproxy/obj_type.h>
@@ -53,7 +54,6 @@
 #include <proto/channel.h>
 #include <proto/cli.h>
 #include <proto/stats.h>
-#include <proto/http_fetch.h>
 #include <proto/queue.h>
 #include <proto/http_ana.h>
 #include <proto/server.h>

diff --git a/src/http_fetch.c b/src/http_fetch.c
index 67dd9894906e7823d5c5df6d4107840d314a4b18..f617aa9def758c7f9b195bc90ae20054ceb80768 100644 (file)
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -25,6 +25,7 @@
 #include <haproxy/h1.h>
 #include <haproxy/h1_htx.h>
 #include <haproxy/http.h>
+#include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 #include <haproxy/obj_type.h>
@@ -35,7 +36,6 @@
 
 #include <haproxy/arg.h>
 #include <proto/channel.h>
-#include <proto/http_fetch.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
 #include <proto/stream.h>

diff --git a/src/http_htx.c b/src/http_htx.c
index 35bb2c6cae63f7a2b5350a44b33c4abfdd7447e9..d5d8747ff2c9c03eca7d589506e2370e67558bc7 100644 (file)
--- a/src/http_htx.c
+++ b/src/http_htx.c
@@ -16,6 +16,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/global.h>
+#include <haproxy/http_fetch.h>
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
 
@@ -26,7 +27,6 @@
 #include <haproxy/htx.h>
 
 #include <haproxy/arg.h>
-#include <proto/http_fetch.h>
 
 struct buffer http_err_chunks[HTTP_ERR_SIZE];
 struct http_reply http_err_replies[HTTP_ERR_SIZE];

diff --git a/src/wurfl.c b/src/wurfl.c
index bbc2f3d649281df023a9c8b59bab1567c8c3e1c6..01cce0d8c46bc8f243d37a71892dbc404b5d467b 100644 (file)
--- a/src/wurfl.c
+++ b/src/wurfl.c
@@ -7,11 +7,11 @@
 #include <haproxy/chunk.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.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 <proto/http_fetch.h>
 #include <haproxy/sample.h>
 #include <import/ebsttree.h>
 #include <import/ebmbtree.h>