gamzinav/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REORG: include: move common/fcgi.h to haproxy/

Browse Source 
The file was moved almost verbatim (only stdio.h was dropped as useless).
It was not split between types and functions because it's only included
from direct C code (fcgi.c and mux_fcgi.c) as well as fcgi_app.h, included
from the same ones, which should also be remerged as a single one.
This commit is contained in:
Willy Tarreau 2020-06-03 14:56:08 +02:00
parent bf0731491b
commit fa2ef5b5eb
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/common/fcgi.h → include/haproxy/fcgi.h
View File

@ -1,5 +1,5 @@
/* /*
* include/common/fcgi.h * include/haproxy/fcgi.h
* This file contains FastCGI protocol definitions. * This file contains FastCGI protocol definitions.
* *
* Copyright (C) 2019 HAProxy Technologies, Christopher Faulet <cfaulet@haproxy.com> * Copyright (C) 2019 HAProxy Technologies, Christopher Faulet <cfaulet@haproxy.com>
@ -19,13 +19,12 @@
* 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 _COMMON_FCGI_H #ifndef _HAPROXY_FCGI_H
#define _COMMON_FCGI_H #define _HAPROXY_FCGI_H
#include <stdio.h> #include <import/ist.h>
#include <haproxy/api.h> #include <haproxy/api.h>
#include <haproxy/buf-t.h> #include <haproxy/buf-t.h>
#include <import/ist.h>
/* FCGI protocol version */ /* FCGI protocol version */
#define FCGI_VERSION 0x1 #define FCGI_VERSION 0x1
@ -90,7 +89,7 @@ struct fcgi_end_request {
}; };
struct fcgi_unknown_type { struct fcgi_unknown_type {
uint8_t type; uint8_t type;
}; };
@ -124,7 +123,7 @@ size_t fcgi_aligned_decode_param(const struct buffer *in, size_t o, struct fcgi_
size_t fcgi_decode_end_request(const struct buffer *in, size_t o, struct fcgi_end_request *r); size_t fcgi_decode_end_request(const struct buffer *in, size_t o, struct fcgi_end_request *r);
#endif /* _COMMON_FCGI_H */ #endif /* _HAPROXY_FCGI_H */
/* /*
* Local variables: * Local variables:

2
include/types/fcgi-app.h
View File

@ -24,7 +24,7 @@
#include <haproxy/api-t.h> #include <haproxy/api-t.h>
#include <import/ist.h> #include <import/ist.h>
#include <common/fcgi.h> #include <haproxy/fcgi.h>
#include <haproxy/list-t.h> #include <haproxy/list-t.h>
#include <haproxy/regex-t.h> #include <haproxy/regex-t.h>

2
src/fcgi.c
View File

@ -24,7 +24,7 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include <common/fcgi.h> #include <haproxy/fcgi.h>
#include <haproxy/buf.h> #include <haproxy/buf.h>
#include <haproxy/istbuf.h> #include <haproxy/istbuf.h>

2
src/mux_fcgi.c
View File

@ -12,7 +12,7 @@
#include <haproxy/api.h> #include <haproxy/api.h>
#include <common/cfgparse.h> #include <common/cfgparse.h>
#include <common/fcgi.h> #include <haproxy/fcgi.h>
#include <haproxy/h1.h> #include <haproxy/h1.h>
#include <haproxy/htx.h> #include <haproxy/htx.h>
#include <import/ist.h> #include <import/ist.h>