RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-16 16:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This one didn't have a type file. A few missing includes were
added (htx, types).
This commit is contained in:
Willy Tarreau 2020-06-04 09:00:02 +02:00
parent 0a3bd3919e
commit c6fe884c74
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/proto/h1_htx.h → include/haproxy/h1_htx.h
View File

@ -1,5 +1,5 @@
/* /*
* include/types/h1_htx.h * include/haproxy/h1_htx.h
* This file defines function prototypes for H1 manipulation using the * This file defines function prototypes for H1 manipulation using the
* internal representation. * internal representation.
* *
@ -20,12 +20,14 @@
* 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_H1_HTX_H #ifndef _HAPROXY_H1_HTX_H
#define _PROTO_H1_HTX_H #define _HAPROXY_H1_HTX_H
#include <haproxy/buf.h>
#include <import/ist.h> #include <import/ist.h>
#include <haproxy/api-t.h>
#include <haproxy/buf-t.h>
#include <haproxy/h1.h> #include <haproxy/h1.h>
#include <haproxy/htx-t.h>
int h1_parse_msg_hdrs(struct h1m *h1m, union h1_sl *h1sl, struct htx *dsthtx, int h1_parse_msg_hdrs(struct h1m *h1m, union h1_sl *h1sl, struct htx *dsthtx,
struct buffer *srcbuf, size_t ofs, size_t max); struct buffer *srcbuf, size_t ofs, size_t max);
@ -41,7 +43,7 @@ int h1_format_htx_stline(const struct htx_sl *sl, struct buffer *chk);
int h1_format_htx_hdr(const struct ist n, const struct ist v, struct buffer *chk); int h1_format_htx_hdr(const struct ist n, const struct ist v, struct buffer *chk);
int h1_format_htx_data(const struct ist data, struct buffer *chk, int chunked); int h1_format_htx_data(const struct ist data, struct buffer *chk, int chunked);
#endif /* _PROTO_H1_HTX_H */ #endif /* _HAPROXY_H1_HTX_H */
/* /*
* Local variables: * Local variables:

3
src/h1_htx.c
View File

@ -13,11 +13,10 @@
#include <haproxy/api.h> #include <haproxy/api.h>
#include <common/cfgparse.h> #include <common/cfgparse.h>
#include <haproxy/h1.h> #include <haproxy/h1.h>
#include <haproxy/h1_htx.h>
#include <haproxy/http.h> #include <haproxy/http.h>
#include <haproxy/htx.h> #include <haproxy/htx.h>
#include <proto/h1_htx.h>
/* Estimate the size of the HTX headers after the parsing, including the EOH. */ /* Estimate the size of the HTX headers after the parsing, including the EOH. */
static size_t h1_eval_htx_hdrs_size(const struct http_hdr *hdrs) static size_t h1_eval_htx_hdrs_size(const struct http_hdr *hdrs)
{ {

2
src/http_fetch.c
View File

@ -20,6 +20,7 @@
#include <haproxy/base64.h> #include <haproxy/base64.h>
#include <haproxy/chunk.h> #include <haproxy/chunk.h>
#include <haproxy/h1.h> #include <haproxy/h1.h>
#include <haproxy/h1_htx.h>
#include <haproxy/http.h> #include <haproxy/http.h>
#include <haproxy/htx.h> #include <haproxy/htx.h>
#include <haproxy/pool.h> #include <haproxy/pool.h>
@ -33,7 +34,6 @@
#include <proto/channel.h> #include <proto/channel.h>
#include <proto/connection.h> #include <proto/connection.h>
#include <proto/http_fetch.h> #include <proto/http_fetch.h>
#include <proto/h1_htx.h>
#include <proto/http_htx.h> #include <proto/http_htx.h>
#include <proto/log.h> #include <proto/log.h>
#include <proto/obj_type.h> #include <proto/obj_type.h>

2
src/mux_fcgi.c
View File

@ -14,6 +14,7 @@
#include <common/cfgparse.h> #include <common/cfgparse.h>
#include <haproxy/fcgi.h> #include <haproxy/fcgi.h>
#include <haproxy/h1.h> #include <haproxy/h1.h>
#include <haproxy/h1_htx.h>
#include <haproxy/htx.h> #include <haproxy/htx.h>
#include <import/ist.h> #include <import/ist.h>
#include <haproxy/list.h> #include <haproxy/list.h>
@ -25,7 +26,6 @@
#include <proto/connection.h> #include <proto/connection.h>
#include <proto/fcgi-app.h> #include <proto/fcgi-app.h>
#include <proto/h1_htx.h>
#include <proto/http_htx.h> #include <proto/http_htx.h>
#include <proto/log.h> #include <proto/log.h>
#include <proto/session.h> #include <proto/session.h>

2
src/mux_h1.c
View File

@ -13,6 +13,7 @@
#include <haproxy/istbuf.h> #include <haproxy/istbuf.h>
#include <common/cfgparse.h> #include <common/cfgparse.h>
#include <haproxy/h1.h> #include <haproxy/h1.h>
#include <haproxy/h1_htx.h>
#include <haproxy/h2.h> #include <haproxy/h2.h>
#include <haproxy/htx.h> #include <haproxy/htx.h>
@ -23,7 +24,6 @@
#include <types/session.h> #include <types/session.h>
#include <proto/connection.h> #include <proto/connection.h>
#include <proto/h1_htx.h>
#include <proto/http_htx.h> #include <proto/http_htx.h>
#include <proto/log.h> #include <proto/log.h>
#include <proto/session.h> #include <proto/session.h>