diff options
author | Willy Tarreau <w@1wt.eu> | 2020-06-04 21:33:21 +0200 |
---|---|---|
committer | Willy Tarreau <w@1wt.eu> | 2020-06-05 20:19:08 +0200 |
commit | 6c426c12b81128b0052b502e90e883296231e380 (patch) | |
tree | f8d333b15eb81d1cf06af73b4214ed6755301a54 | |
parent | 67f929da164028bce333bd2f1a0918bc7524cc8d (diff) | |
download | haproxy-6c426c12b81128b0052b502e90e883296231e380.tar.gz |
REORG: include: move fcgi-app.h to haproxy/fcgi-app{,-t}.h
Only arg-t.h was missing from the types to get arg_list.
-rw-r--r-- | include/haproxy/fcgi-app-t.h (renamed from include/types/fcgi-app.h) | 17 | ||||
-rw-r--r-- | include/haproxy/fcgi-app.h (renamed from include/proto/fcgi-app.h) | 12 | ||||
-rw-r--r-- | src/fcgi-app.c | 2 | ||||
-rw-r--r-- | src/mux_fcgi.c | 2 |
4 files changed, 16 insertions, 17 deletions
diff --git a/include/types/fcgi-app.h b/include/haproxy/fcgi-app-t.h index 61698ff92..43bb99437 100644 --- a/include/types/fcgi-app.h +++ b/include/haproxy/fcgi-app-t.h @@ -1,5 +1,5 @@ /* - * include/types/fcgi-app.h + * include/haproxy/fcgi-app-t.h * This file defines everything related to FCGI applications. * * Copyright (C) 2019 HAProxy Technologies, Christopher Faulet <cfaulet@haproxy.com> @@ -19,18 +19,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TYPES_HTTP_FCGI_H -#define _TYPES_HTTP_FCGI_H +#ifndef _HAPROXY_HTTP_FCGI_T_H +#define _HAPROXY_HTTP_FCGI_T_H -#include <haproxy/acl-t.h> -#include <haproxy/types.h> +#include <import/ebpttree.h> #include <import/ist.h> + +#include <haproxy/acl-t.h> +#include <haproxy/arg-t.h> #include <haproxy/fcgi.h> #include <haproxy/filters-t.h> #include <haproxy/list-t.h> #include <haproxy/regex-t.h> - -#include <import/ebistree.h> +#include <haproxy/types.h> #define FCGI_APP_FL_KEEP_CONN 0x00000001 /* Keep the connection alive */ #define FCGI_APP_FL_GET_VALUES 0x00000002 /* Retrieve FCGI variables on connection establishment */ @@ -113,7 +114,7 @@ struct fcgi_flt_ctx { struct fcgi_app *app; }; -#endif /* _TYPES_HTTP_FCGI_H */ +#endif /* _HAPROXY_HTTP_FCGI_T_H */ /* * Local variables: diff --git a/include/proto/fcgi-app.h b/include/haproxy/fcgi-app.h index 424d018a4..becfdde9c 100644 --- a/include/proto/fcgi-app.h +++ b/include/haproxy/fcgi-app.h @@ -1,5 +1,5 @@ /* - * include/proto/fcgi-app.h + * include/haproxy/fcgi-app.h * This file defines function prototypes for FCGI applications. * * Copyright (C) 2019 HAProxy Technologies, Christopher Faulet <cfaulet@haproxy.com> @@ -19,12 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _PROTO_HTTP_FCGI_H -#define _PROTO_HTTP_FCGI_H +#ifndef _HAPROXY_HTTP_FCGI_H +#define _HAPROXY_HTTP_FCGI_H -#include <haproxy/htx.h> - -#include <types/fcgi-app.h> +#include <haproxy/fcgi-app-t.h> #include <types/proxy.h> #include <types/stream.h> @@ -34,7 +32,7 @@ struct fcgi_flt_ctx *find_strm_fcgi_ctx(struct stream *s); struct fcgi_app *get_px_fcgi_app(struct proxy *px); struct fcgi_app *get_strm_fcgi_app(struct stream *s); -#endif /* _PROTO_HTTP_FCGI_H */ +#endif /* _HAPROXY_HTTP_FCGI_H */ /* * Local variables: diff --git a/src/fcgi-app.c b/src/fcgi-app.c index 307c6ca02..75e62a628 100644 --- a/src/fcgi-app.c +++ b/src/fcgi-app.c @@ -15,6 +15,7 @@ #include <haproxy/chunk.h> #include <common/cfgparse.h> #include <haproxy/errors.h> +#include <haproxy/fcgi-app.h> #include <haproxy/filters.h> #include <haproxy/http_fetch.h> #include <haproxy/http_htx.h> @@ -25,7 +26,6 @@ #include <haproxy/global.h> -#include <proto/fcgi-app.h> #include <proto/log.h> #include <proto/proxy.h> #include <proto/server.h> diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c index 99c88e4fd..5310e023e 100644 --- a/src/mux_fcgi.c +++ b/src/mux_fcgi.c @@ -14,6 +14,7 @@ #include <common/cfgparse.h> #include <haproxy/connection.h> #include <haproxy/fcgi.h> +#include <haproxy/fcgi-app.h> #include <haproxy/h1.h> #include <haproxy/h1_htx.h> #include <haproxy/http_htx.h> @@ -28,7 +29,6 @@ #include <types/proxy.h> -#include <proto/fcgi-app.h> #include <proto/log.h> #include <proto/stream.h> #include <haproxy/trace.h> |