RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-11 14:05:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
667c905fe5
haproxy/include/proto/proto_http.h

129 lines
5.7 KiB
C
Raw Normal View History

[BIGMOVE] exploded the monolithic haproxy.c file into multiple files. The files are now stored under : - include/haproxy for the generic includes - include/types.h for the structures needed within prototypes - include/proto.h for function prototypes and inline functions - src/*.c for the C files Most include files are now covered by LGPL. A last move still needs to be done to put inline functions under GPL and not LGPL. Version has been set to 1.3.0 in the code but some control still needs to be done before releasing.
2006-06-26 00:48:02 +00:00
/*
[MEDIUM] stats: make HTTP stats use an I/O handler Doing this, we can remove the last BF_HIJACK user and remove produce_content(). s->data_source could also be removed but it is currently used to detect if the stats or a server was used.
2009-10-04 13:56:38 +00:00
* include/proto/proto_http.h
* This file contains HTTP protocol definitions.
*
[REORG] http: move the http-request rules to proto_http And also rename "req_acl_rule" "http_req_rule". At the beginning that was a bit confusing to me, especially the "req_acl" list which in fact holds what we call rules. After some digging, it appeared that some part of the code is 100% HTTP and not just related to authentication anymore, so let's move that part to HTTP and keep the auth-only code in auth.c.
2011-01-06 16:51:27 +00:00
* Copyright (C) 2000-2011 Willy Tarreau - w@1wt.eu
[MEDIUM] stats: make HTTP stats use an I/O handler Doing this, we can remove the last BF_HIJACK user and remove produce_content(). s->data_source could also be removed but it is currently used to detect if the stats or a server was used.
2009-10-04 13:56:38 +00:00
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation, version 2.1
* exclusively.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
[BIGMOVE] exploded the monolithic haproxy.c file into multiple files. The files are now stored under : - include/haproxy for the generic includes - include/types.h for the structures needed within prototypes - include/proto.h for function prototypes and inline functions - src/*.c for the C files Most include files are now covered by LGPL. A last move still needs to be done to put inline functions under GPL and not LGPL. Version has been set to 1.3.0 in the code but some control still needs to be done before releasing.
2006-06-26 00:48:02 +00:00
#ifndef _PROTO_PROTO_HTTP_H
#define _PROTO_PROTO_HTTP_H
[CLEANUP] included common/version.h everywhere
2006-06-29 16:54:54 +00:00
#include <common/config.h>
[BIGMOVE] exploded the monolithic haproxy.c file into multiple files. The files are now stored under : - include/haproxy for the generic includes - include/types.h for the structures needed within prototypes - include/proto.h for function prototypes and inline functions - src/*.c for the C files Most include files are now covered by LGPL. A last move still needs to be done to put inline functions under GPL and not LGPL. Version has been set to 1.3.0 in the code but some control still needs to be done before releasing.
2006-06-26 00:48:02 +00:00
#include <types/proto_http.h>
#include <types/session.h>
#include <types/task.h>
[MAJOR] replaced the client-side HTTP parser with a new one The new parser uses an FSM to strictly follow RFC2616. Headers are indexed and parsed only once they're all available. That way, complex regexes make more sense. HTTP processing is now performed in several phases by calling multiple functions, making the code cleaner and easier to read. Note that req[i]pass does not work anymore because it would require that we mark a header to be ignored. What is really needed is to have the ability to add an exception to a matching (match xx except yy). Several bugs have been fixed in appsession during the conversion to the new FSM (method length and recovery on malloc errors). The code does build and work with the debug examples, but is not usable yet to connect to anything as it does not forward the requests yet.
2006-12-04 01:26:12 +00:00
/*
* some macros used for the request parsing.
* from RFC2616:
* CTL = <any US-ASCII control character (octets 0 - 31) and DEL (127)>
[MAJOR] huge rework of the HTTP request FSM The HTTP parser has been rewritten for better compliance to RFC2616. The same parser is now usable for both requests and responses, and it now supports HTTP/0.9 as well as multi-line headers. It has also been improved for speed ; a typicial HTTP request is parsed in about 2 microseconds on a 1 GHz processor. The monitor-uri check has been moved so that the requests are not logged. The httpclose option now tries to change as little as possible in the request, and does not affect the first header if it is already set to 'close'. HTTP/0.9 requests are converted to HTTP/1.0 before being forwarded. Headers and request transformations are now distinct. The headers list is updated after each insertion/removal/transformation. The request is re-parsed and checked after each transformation. It is not possible anymore to remove a request, and requests which lead to invalid request lines are now rejected.
2007-01-21 18:16:41 +00:00
* SEP = one of the 17 defined separators or SP or HT
* LWS = CR, LF, SP or HT
* SPHT = SP or HT. Use this macro and not a boolean expression for best speed.
* CRLF = CR or LF. Use this macro and not a boolean expression for best speed.
* token = any CHAR except CTL or SEP. Use this macro and not a boolean expression for best speed.
[MINOR] implement http_is_ver_token to fix response parsing This new character map improves accuracy when parsing HTTP version, which helps inspecting requests, and fixes response handling.
2007-03-04 17:13:58 +00:00
*
* added for ease of use:
* ver_token = 'H', 'P', 'T', '/', '.', and digits.
[MAJOR] replaced the client-side HTTP parser with a new one The new parser uses an FSM to strictly follow RFC2616. Headers are indexed and parsed only once they're all available. That way, complex regexes make more sense. HTTP processing is now performed in several phases by calling multiple functions, making the code cleaner and easier to read. Note that req[i]pass does not work anymore because it would require that we mark a header to be ignored. What is really needed is to have the ability to add an exception to a matching (match xx except yy). Several bugs have been fixed in appsession during the conversion to the new FSM (method length and recovery on malloc errors). The code does build and work with the debug examples, but is not usable yet to connect to anything as it does not forward the requests yet.
2006-12-04 01:26:12 +00:00
*/
[MAJOR] huge rework of the HTTP request FSM The HTTP parser has been rewritten for better compliance to RFC2616. The same parser is now usable for both requests and responses, and it now supports HTTP/0.9 as well as multi-line headers. It has also been improved for speed ; a typicial HTTP request is parsed in about 2 microseconds on a 1 GHz processor. The monitor-uri check has been moved so that the requests are not logged. The httpclose option now tries to change as little as possible in the request, and does not affect the first header if it is already set to 'close'. HTTP/0.9 requests are converted to HTTP/1.0 before being forwarded. Headers and request transformations are now distinct. The headers list is updated after each insertion/removal/transformation. The request is re-parsed and checked after each transformation. It is not possible anymore to remove a request, and requests which lead to invalid request lines are now rejected.
2007-01-21 18:16:41 +00:00
extern const char http_is_ctl[256];
extern const char http_is_sep[256];
extern const char http_is_lws[256];
extern const char http_is_spht[256];
extern const char http_is_crlf[256];
extern const char http_is_token[256];
[MINOR] implement http_is_ver_token to fix response parsing This new character map improves accuracy when parsing HTTP version, which helps inspecting requests, and fixes response handling.
2007-03-04 17:13:58 +00:00
extern const char http_is_ver_token[256];
[MAJOR] huge rework of the HTTP request FSM The HTTP parser has been rewritten for better compliance to RFC2616. The same parser is now usable for both requests and responses, and it now supports HTTP/0.9 as well as multi-line headers. It has also been improved for speed ; a typicial HTTP request is parsed in about 2 microseconds on a 1 GHz processor. The monitor-uri check has been moved so that the requests are not logged. The httpclose option now tries to change as little as possible in the request, and does not affect the first header if it is already set to 'close'. HTTP/0.9 requests are converted to HTTP/1.0 before being forwarded. Headers and request transformations are now distinct. The headers list is updated after each insertion/removal/transformation. The request is re-parsed and checked after each transformation. It is not possible anymore to remove a request, and requests which lead to invalid request lines are now rejected.
2007-01-21 18:16:41 +00:00
[REORG] http: move HTTP error codes back to proto_http.h This one was left isolated in its own file. It probably is a leftover from the 1.2->1.3 split.
2011-05-11 14:10:11 +00:00
extern const int http_err_codes[HTTP_ERR_SIZE];
extern struct chunk http_err_chunks[HTTP_ERR_SIZE];
extern const char *HTTP_302;
extern const char *HTTP_303;
[MAJOR] huge rework of the HTTP request FSM The HTTP parser has been rewritten for better compliance to RFC2616. The same parser is now usable for both requests and responses, and it now supports HTTP/0.9 as well as multi-line headers. It has also been improved for speed ; a typicial HTTP request is parsed in about 2 microseconds on a 1 GHz processor. The monitor-uri check has been moved so that the requests are not logged. The httpclose option now tries to change as little as possible in the request, and does not affect the first header if it is already set to 'close'. HTTP/0.9 requests are converted to HTTP/1.0 before being forwarded. Headers and request transformations are now distinct. The headers list is updated after each insertion/removal/transformation. The request is re-parsed and checked after each transformation. It is not possible anymore to remove a request, and requests which lead to invalid request lines are now rejected.
2007-01-21 18:16:41 +00:00
#define HTTP_IS_CTL(x) (http_is_ctl[(unsigned char)(x)])
#define HTTP_IS_SEP(x) (http_is_sep[(unsigned char)(x)])
#define HTTP_IS_LWS(x) (http_is_lws[(unsigned char)(x)])
#define HTTP_IS_SPHT(x) (http_is_spht[(unsigned char)(x)])
#define HTTP_IS_CRLF(x) (http_is_crlf[(unsigned char)(x)])
#define HTTP_IS_TOKEN(x) (http_is_token[(unsigned char)(x)])
[MINOR] implement http_is_ver_token to fix response parsing This new character map improves accuracy when parsing HTTP version, which helps inspecting requests, and fixes response handling.
2007-03-04 17:13:58 +00:00
#define HTTP_IS_VER_TOKEN(x) (http_is_ver_token[(unsigned char)(x)])
[BIGMOVE] exploded the monolithic haproxy.c file into multiple files. The files are now stored under : - include/haproxy for the generic includes - include/types.h for the structures needed within prototypes - include/proto.h for function prototypes and inline functions - src/*.c for the C files Most include files are now covered by LGPL. A last move still needs to be done to put inline functions under GPL and not LGPL. Version has been set to 1.3.0 in the code but some control still needs to be done before releasing.
2006-06-26 00:48:02 +00:00
int event_accept(int fd);
int process_cli(struct session *t);
[MAJOR] rework of the server FSM srv_state has been removed from HTTP state machines, and states have been split in either TCP states or analyzers. For instance, the TARPIT state has just become a simple analyzer. New flags have been added to the struct buffer to compensate this. The high-level stream processors sometimes need to force a disconnection without touching a file-descriptor (eg: report an error). But if they touched BF_SHUTW or BF_SHUTR, the file descriptor would not be closed. Thus, the two SHUT?_NOW flags have been added so that an application can request a forced close which the stream interface will be forced to obey. During this change, a new BF_HIJACK flag was added. It will be used for data generation, eg during a stats dump. It prevents the producer on a buffer from sending data into it. BF_SHUTR_NOW /* the producer must shut down for reads ASAP */ BF_SHUTW_NOW /* the consumer must shut down for writes ASAP */ BF_HIJACK /* the producer is temporarily replaced */ BF_SHUTW_NOW has precedence over BF_HIJACK. BF_HIJACK has precedence over BF_MAY_FORWARD (so that it does not need it). New functions buffer_shutr_now(), buffer_shutw_now(), buffer_abort() are provided to manipulate BF_SHUT* flags. A new type "stream_interface" has been added to describe both sides of a buffer. A stream interface has states and error reporting. The session now has two stream interfaces (one per side). Each buffer has stream_interface pointers to both consumer and producer sides. The server-side file descriptor has moved to its stream interface, so that even the buffer has access to it. process_srv() has been split into three parts : - tcp_get_connection() obtains a connection to the server - tcp_connection_failed() tests if a previously attempted connection has succeeded or not. - process_srv_data() only manages the data phase, and in this sense should be roughly equivalent to process_cli. Little code has been removed, and a lot of old code has been left in comments for now.
2008-10-19 05:30:41 +00:00
int process_srv_data(struct session *t);
int process_srv_conn(struct session *t);
REORG/MAJOR: use "struct channel" instead of "struct buffer" This is a massive rename. We'll then split channel and buffer. This change needs a lot of cleanups. At many locations, the parameter or variable is still called "buf" which will become ambiguous. Also, the "struct channel" is still defined in buffers.h.
2012-07-02 13:11:27 +00:00
int http_wait_for_request(struct session *s, struct channel *req, int an_bit);
int http_process_req_common(struct session *s, struct channel *req, int an_bit, struct proxy *px);
int http_process_request(struct session *t, struct channel *req, int an_bit);
int http_process_tarpit(struct session *s, struct channel *req, int an_bit);
int http_process_request_body(struct session *s, struct channel *req, int an_bit);
MEDIUM: http: http_send_name_header: remove references to msg and buffer They can be deduced from txn.
2012-03-09 11:11:57 +00:00
int http_send_name_header(struct http_txn *txn, struct proxy* be, const char* svr_name);
REORG/MAJOR: use "struct channel" instead of "struct buffer" This is a massive rename. We'll then split channel and buffer. This change needs a lot of cleanups. At many locations, the parameter or variable is still called "buf" which will become ambiguous. Also, the "struct channel" is still defined in buffers.h.
2012-07-02 13:11:27 +00:00
int http_wait_for_response(struct session *s, struct channel *rep, int an_bit);
int http_process_res_common(struct session *t, struct channel *rep, int an_bit, struct proxy *px);
int http_request_forward_body(struct session *s, struct channel *req, int an_bit);
int http_response_forward_body(struct session *s, struct channel *res, int an_bit);
[BIGMOVE] exploded the monolithic haproxy.c file into multiple files. The files are now stored under : - include/haproxy for the generic includes - include/types.h for the structures needed within prototypes - include/proto.h for function prototypes and inline functions - src/*.c for the C files Most include files are now covered by LGPL. A last move still needs to be done to put inline functions under GPL and not LGPL. Version has been set to 1.3.0 in the code but some control still needs to be done before releasing.
2006-06-26 00:48:02 +00:00
[MAJOR] replaced the client-side HTTP parser with a new one The new parser uses an FSM to strictly follow RFC2616. Headers are indexed and parsed only once they're all available. That way, complex regexes make more sense. HTTP processing is now performed in several phases by calling multiple functions, making the code cleaner and easier to read. Note that req[i]pass does not work anymore because it would require that we mark a header to be ignored. What is really needed is to have the ability to add an exception to a matching (match xx except yy). Several bugs have been fixed in appsession during the conversion to the new FSM (method length and recovery on malloc errors). The code does build and work with the debug examples, but is not usable yet to connect to anything as it does not forward the requests yet.
2006-12-04 01:26:12 +00:00
void debug_hdr(const char *dir, struct session *t, const char *start, const char *end);
[MAJOR] huge rework of the HTTP request FSM The HTTP parser has been rewritten for better compliance to RFC2616. The same parser is now usable for both requests and responses, and it now supports HTTP/0.9 as well as multi-line headers. It has also been improved for speed ; a typicial HTTP request is parsed in about 2 microseconds on a 1 GHz processor. The monitor-uri check has been moved so that the requests are not logged. The httpclose option now tries to change as little as possible in the request, and does not affect the first header if it is already set to 'close'. HTTP/0.9 requests are converted to HTTP/1.0 before being forwarded. Headers and request transformations are now distinct. The headers list is updated after each insertion/removal/transformation. The request is re-parsed and checked after each transformation. It is not possible anymore to remove a request, and requests which lead to invalid request lines are now rejected.
2007-01-21 18:16:41 +00:00
void get_srv_from_appsession(struct session *t, const char *begin, int len);
REORG/MAJOR: use "struct channel" instead of "struct buffer" This is a massive rename. We'll then split channel and buffer. This change needs a lot of cleanups. At many locations, the parameter or variable is still called "buf" which will become ambiguous. Also, the "struct channel" is still defined in buffers.h.
2012-07-02 13:11:27 +00:00
int apply_filter_to_req_headers(struct session *t, struct channel *req, struct hdr_exp *exp);
int apply_filter_to_req_line(struct session *t, struct channel *req, struct hdr_exp *exp);
int apply_filters_to_request(struct session *s, struct channel *req, struct proxy *px);
int apply_filters_to_response(struct session *t, struct channel *rtr, struct proxy *px);
[MEDIUM] appsession: add "len", "prefix" and "mode" options To sum up : - len : it's now the max number of characters for the value, preventing garbaged results. - a new option "prefix" is added, this allows to use dynamic cookie names (e.g. ASPSESSIONIDXXX). Previously in the thread, I wanted to use the value found with "capture cookie" but when i started to update the documentation, I found this solution quite weird. I've made a small rework to not depend on "capture cookie". - There's the posssiblity to define the URL parser mode (path parameters or query string).
2009-11-29 19:04:48 +00:00
void manage_client_side_appsession(struct session *t, const char *buf, int len);
REORG/MAJOR: use "struct channel" instead of "struct buffer" This is a massive rename. We'll then split channel and buffer. This change needs a lot of cleanups. At many locations, the parameter or variable is still called "buf" which will become ambiguous. Also, the "struct channel" is still defined in buffers.h.
2012-07-02 13:11:27 +00:00
void manage_client_side_cookies(struct session *t, struct channel *req);
void manage_server_side_cookies(struct session *t, struct channel *rtr);
void check_response_for_cacheability(struct session *t, struct channel *rtr);
[REORG] session: move the data_ctx struct to the stream interface's applet This is in fact where those parts belong to. The old data_state was replaced by applet.state and is now initialized when the applet is registered. It's worth noting that the applet does not need to know the session nor the buffer anymore since everything is brought by the stream interface. It is possible that having a separate applet struct would simplify the code but that's not a big deal.
2011-03-10 10:25:07 +00:00
int stats_check_uri(struct stream_interface *si, struct http_txn *txn, struct proxy *backend);
[MEDIUM] errorloc now checked first from backend then from frontend It is now possible to define an errorloc in the backend as well as in the frontend. The backend's will be used first, and if undefined, then the frontend's will be used instead. If none is used, then the original error messages will be used.
2006-12-24 16:47:20 +00:00
void init_proto_http();
[MAJOR] implement parameter hashing for POST requests This patch extends the "url_param" load balancing method by introducing the "check_post" option. Using this option enables analysis of the beginning of POST requests to search for the specified URL parameter. The patch also fixes a few minor typos in comments that were discovered during code review.
2008-04-14 18:47:37 +00:00
int http_find_header2(const char *name, int len,
[MINOR] http: add http_remove_header2() to remove a header value. Calling this function after http_find_header2() automatically deletes the current value of the header, and removes the header itself if the value is the only one. The context is automatically adjusted for a next call to http_find_header2() to return the next header. No other change nor test should be made on the transient context though.
2010-01-18 13:54:04 +00:00
char *sol, struct hdr_idx *idx,
[MAJOR] implement parameter hashing for POST requests This patch extends the "url_param" load balancing method by introducing the "check_post" option. Using this option enables analysis of the beginning of POST requests to search for the specified URL parameter. The patch also fixes a few minor typos in comments that were discovered during code review.
2008-04-14 18:47:37 +00:00
struct hdr_ctx *ctx);
[CLEANUP] move the session-related functions to session.c proto_http.c was not suitable for session-related processing, it was just convenient for the tranformation. Some more splitting must occur: process_request/response in proto_http.c must be split again per protocol, and the caller must run a list. Some functions should be directly attached to the session or the buffer (eg: perform_http_redirect, return_srv_error, http_sess_log).
2008-11-30 17:47:21 +00:00
void http_sess_log(struct session *s);
void perform_http_redirect(struct session *s, struct stream_interface *si);
[MEDIUM] make the http server error function a pointer in the session It was a bit awkward to have session.c call return_srv_error() for HTTP error messages related to servers. The function has been adapted to be passed a pointer to the faulty stream interface, and is now a pointer in the session. It is possible that in the future, it will become a callback in the stream interface itself.
2008-11-30 19:44:17 +00:00
void http_return_srv_error(struct session *s, struct stream_interface *si);
[MEDIUM] http: capture invalid requests/responses even if accepted It's useful to be able to accept an invalid header name in a request or response but still be able to monitor further such errors. Now, when an invalid request/response is received and accepted due to an "accept-invalid-http-{request|response}" option, the invalid request will be captured for later analysis with "show errors" on the stats socket.
2009-04-02 13:18:36 +00:00
void http_capture_bad_message(struct error_snapshot *es, struct session *s,
MEDIUM: http: remove buffer arg in http_capture_bad_message The buffer pointer is now taken from the http_msg.
2012-03-09 12:39:23 +00:00
struct http_msg *msg,
[MINOR] stats: report HTTP message state and buffer flags in error dumps Debugging parsing errors can be greatly improved if we know what the parser state was and what the buffer flags were (especially for closed inputs/outputs and full buffers). Let's add that to the error snapshots.
2010-12-12 11:46:33 +00:00
int state, struct proxy *other_end);
MEDIUM: http: merge acl and pattern header fetch functions HTTP header fetch is now done using smp_fetch_hdr() for both ACLs and patterns. This one also supports an occurrence number, making it possible to specify explicit occurrences for ACLs and patterns.
2012-04-26 13:11:51 +00:00
unsigned int http_get_hdr(const struct http_msg *msg, const char *hname, int hlen,
MEDIUM: http: replace get_ip_from_hdr2() with http_get_hdr() The new function does not return IP addresses but header values instead, so that the caller is free to make what it want of them. The conversion is not quite clean yet, as the previous test which considered that address 0.0.0.0 meant "no address" is still used. A different IP parsing function should be used to take this into account.
2011-12-16 20:35:50 +00:00
struct hdr_idx *idx, int occ,
struct hdr_ctx *ctx, char **vptr, int *vlen);
[BIGMOVE] exploded the monolithic haproxy.c file into multiple files. The files are now stored under : - include/haproxy for the generic includes - include/types.h for the structures needed within prototypes - include/proto.h for function prototypes and inline functions - src/*.c for the C files Most include files are now covered by LGPL. A last move still needs to be done to put inline functions under GPL and not LGPL. Version has been set to 1.3.0 in the code but some control still needs to be done before releasing.
2006-06-26 00:48:02 +00:00
[MINOR] http: move the http transaction init/cleanup code to proto_http This code really belongs to the http part since it's transaction-specific. This will also make it easier to later reinitialize a transaction in order to support keepalive.
2009-12-22 14:03:09 +00:00
void http_init_txn(struct session *s);
void http_end_txn(struct session *s);
void http_reset_txn(struct session *s);
[REORG] http: move the http-request rules to proto_http And also rename "req_acl_rule" "http_req_rule". At the beginning that was a bit confusing to me, especially the "req_acl" list which in fact holds what we call rules. After some digging, it appeared that some part of the code is 100% HTTP and not just related to authentication anymore, so let's move that part to HTTP and keep the auth-only code in auth.c.
2011-01-06 16:51:27 +00:00
struct http_req_rule *parse_http_req_cond(const char **args, const char *file, int linenum, struct proxy *proxy);
void free_http_req_rules(struct list *r);
BUILD: http: rename error_message http_error_message to fix conflicts on RHEL Duncan Hall reported a build issue on CentOS where error_message conflicts with another system declaration when SSL is enabled. Rename the function.
2012-09-04 10:19:04 +00:00
struct chunk *http_error_message(struct session *s, int msgnum);
[REORG] http: move the http-request rules to proto_http And also rename "req_acl_rule" "http_req_rule". At the beginning that was a bit confusing to me, especially the "req_acl" list which in fact holds what we call rules. After some digging, it appeared that some part of the code is 100% HTTP and not just related to authentication anymore, so let's move that part to HTTP and keep the auth-only code in auth.c.
2011-01-06 16:51:27 +00:00
[MINOR] http: keep pointer to beginning of data We now set msg->col and msg->sov to the first byte of non-header. They will be used later when parsing chunks. A new macro was added to perform size additions on an http_msg in order to limit the risks of copy-paste in the long term. During this operation, it appeared that the http_msg struct was not optimal on 64-bit, so it was re-ordered to fill the holes.
2009-11-29 17:12:29 +00:00
/* to be used when contents change in an HTTP message */
#define http_msg_move_end(msg, bytes) do { \
unsigned int _bytes = (bytes); \
MAJOR: http: move buffer->lr to http_msg->next The buffer's pointer <lr> was only used by HTTP parsers which also use a struct http_msg to keep track of the parser's state. We've reached a point where it makes no sense to keep ->lr in the buffer, as the split between buffer and msg is only arbitrary for historical reasons. This change ensures that touching buffers will not impact HTTP messages anymore, making the buffers more content-agnostic. However, it becomes very important not to forget to update msg->next when some data get forwarded or moved (and in general each time buf->p is updated). The new pointer in http_msg becomes relative to buffer->p so that parsing multiple messages becomes easier. It is possible that at one point ->som and ->next will be merged. Note: http_parse_reqline() and http_parse_stsline() have been temporarily modified to know the message starting point in the buffer (->p).
2012-03-05 10:17:50 +00:00
(msg)->next += (_bytes); \
[MINOR] http: keep pointer to beginning of data We now set msg->col and msg->sov to the first byte of non-header. They will be used later when parsing chunks. A new macro was added to perform size additions on an http_msg in order to limit the risks of copy-paste in the long term. During this operation, it appeared that the http_msg struct was not optimal on 64-bit, so it was re-ordered to fill the holes.
2009-11-29 17:12:29 +00:00
(msg)->sov += (_bytes); \
(msg)->eoh += (_bytes); \
} while (0)
[BIGMOVE] exploded the monolithic haproxy.c file into multiple files. The files are now stored under : - include/haproxy for the generic includes - include/types.h for the structures needed within prototypes - include/proto.h for function prototypes and inline functions - src/*.c for the C files Most include files are now covered by LGPL. A last move still needs to be done to put inline functions under GPL and not LGPL. Version has been set to 1.3.0 in the code but some control still needs to be done before releasing.
2006-06-26 00:48:02 +00:00
#endif /* _PROTO_PROTO_HTTP_H */
/*
* Local variables:
* c-indent-level: 8
* c-basic-offset: 8
* End:
*/
Reference in New Issue Copy Permalink