RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-03 02:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
There's no type file for this trivial one. The unneeded dependency on
htx.h was dropped.
This commit is contained in:
Willy Tarreau 2020-06-04 18:26:43 +02:00
parent 4aa573da6f
commit 126ba3a1e1
8 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/proto/http_fetch.h → include/haproxy/http_fetch.h
View File

@ -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:

2
src/51d.c
View File

@ -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>

2
src/da.c
View File

@ -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>

2
src/fcgi-app.c
View File

@ -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>

2
src/hlua.c
View File

@ -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>

2
src/http_fetch.c
View File

@ -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>

2
src/http_htx.c
View File

@ -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];

2
src/wurfl.c
View File

@ -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>