mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-28 22:31:06 +01:00
Code Issues Projects Releases Wiki Activity

REORG: include: move fcgi-app.h to haproxy/fcgi-app{,-t}.h

Browse Source 
Only arg-t.h was missing from the types to get arg_list.
This commit is contained in:
Willy Tarreau 2020-06-04 21:33:21 +02:00
parent c7babd8570
commit c6599682d5
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/types/fcgi-app.h → include/haproxy/fcgi-app-t.h
View File

@ -1,5 +1,5 @@
/* /*
* include/types/fcgi-app.h * include/haproxy/fcgi-app-t.h
* This file defines everything related to FCGI applications. * This file defines everything related to FCGI applications.
* *
* Copyright (C) 2019 HAProxy Technologies, Christopher Faulet <cfaulet@haproxy.com> * 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 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _TYPES_HTTP_FCGI_H #ifndef _HAPROXY_HTTP_FCGI_T_H
#define _TYPES_HTTP_FCGI_H #define _HAPROXY_HTTP_FCGI_T_H
#include <import/ebpttree.h>
#include <import/ist.h>
#include <haproxy/acl-t.h> #include <haproxy/acl-t.h>
#include <haproxy/api-t.h> #include <haproxy/arg-t.h>
#include <import/ist.h>
#include <haproxy/fcgi.h> #include <haproxy/fcgi.h>
#include <haproxy/filters-t.h> #include <haproxy/filters-t.h>
#include <haproxy/list-t.h> #include <haproxy/list-t.h>
#include <haproxy/regex-t.h> #include <haproxy/regex-t.h>
#include <haproxy/api-t.h>
#include <import/ebistree.h>
#define FCGI_APP_FL_KEEP_CONN 0x00000001 /* Keep the connection alive */ #define FCGI_APP_FL_KEEP_CONN 0x00000001 /* Keep the connection alive */
#define FCGI_APP_FL_GET_VALUES 0x00000002 /* Retrieve FCGI variables on connection establishment */ #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; struct fcgi_app *app;
}; };
#endif /* _TYPES_HTTP_FCGI_H */ #endif /* _HAPROXY_HTTP_FCGI_T_H */
/* /*
* Local variables: * Local variables:

12
include/proto/fcgi-app.h → include/haproxy/fcgi-app.h
View File

@ -1,5 +1,5 @@
/* /*
* include/proto/fcgi-app.h * include/haproxy/fcgi-app.h
* This file defines function prototypes for FCGI applications. * This file defines function prototypes for FCGI applications.
* *
* Copyright (C) 2019 HAProxy Technologies, Christopher Faulet <cfaulet@haproxy.com> * 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 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _PROTO_HTTP_FCGI_H #ifndef _HAPROXY_HTTP_FCGI_H
#define _PROTO_HTTP_FCGI_H #define _HAPROXY_HTTP_FCGI_H
#include <haproxy/htx.h> #include <haproxy/fcgi-app-t.h>
#include <types/fcgi-app.h>
#include <types/proxy.h> #include <types/proxy.h>
#include <types/stream.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_px_fcgi_app(struct proxy *px);
struct fcgi_app *get_strm_fcgi_app(struct stream *s); struct fcgi_app *get_strm_fcgi_app(struct stream *s);
#endif /* _PROTO_HTTP_FCGI_H */ #endif /* _HAPROXY_HTTP_FCGI_H */
/* /*
* Local variables: * Local variables:

2
src/fcgi-app.c
View File

@ -15,6 +15,7 @@
#include <haproxy/chunk.h> #include <haproxy/chunk.h>
#include <common/cfgparse.h> #include <common/cfgparse.h>
#include <haproxy/errors.h> #include <haproxy/errors.h>
#include <haproxy/fcgi-app.h>
#include <haproxy/filters.h> #include <haproxy/filters.h>
#include <haproxy/http_fetch.h> #include <haproxy/http_fetch.h>
#include <haproxy/http_htx.h> #include <haproxy/http_htx.h>
@ -25,7 +26,6 @@
#include <haproxy/global.h> #include <haproxy/global.h>
#include <proto/fcgi-app.h>
#include <proto/log.h> #include <proto/log.h>
#include <proto/proxy.h> #include <proto/proxy.h>
#include <proto/server.h> #include <proto/server.h>

2
src/mux_fcgi.c
View File

@ -14,6 +14,7 @@
#include <common/cfgparse.h> #include <common/cfgparse.h>
#include <haproxy/connection.h> #include <haproxy/connection.h>
#include <haproxy/fcgi.h> #include <haproxy/fcgi.h>
#include <haproxy/fcgi-app.h>
#include <haproxy/h1.h> #include <haproxy/h1.h>
#include <haproxy/h1_htx.h> #include <haproxy/h1_htx.h>
#include <haproxy/http_htx.h> #include <haproxy/http_htx.h>
@ -28,7 +29,6 @@
#include <types/proxy.h> #include <types/proxy.h>
#include <proto/fcgi-app.h>
#include <proto/log.h> #include <proto/log.h>
#include <proto/stream.h> #include <proto/stream.h>
#include <haproxy/trace.h> #include <haproxy/trace.h>