mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-29 23:01:03 +01:00
Code Issues Projects Releases Wiki Activity

CLEANUP: http: rename http_process_request_body()

Browse Source 
This function does not process anything, it just waits for the beginning
of the request body. Let's rename it http_wait_for_request_body().
This commit is contained in:
Willy Tarreau 2014-04-10 11:16:06 +02:00
parent 226071e0a7
commit 5a8f947f4f
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/proto/proto_http.h
View File

@ -70,7 +70,7 @@ 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_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_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_tarpit(struct session *s, struct channel *req, int an_bit);
int http_process_request_body(struct session *s, struct channel *req, int an_bit); int http_wait_for_request_body(struct session *s, struct channel *req, int an_bit);
int http_send_name_header(struct http_txn *txn, struct proxy* be, const char* svr_name); int http_send_name_header(struct http_txn *txn, struct proxy* be, const char* svr_name);
int http_wait_for_response(struct session *s, struct channel *rep, int an_bit); 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_process_res_common(struct session *t, struct channel *rep, int an_bit, struct proxy *px);

15
src/proto_http.c
View File

@ -4278,13 +4278,16 @@ int http_process_tarpit(struct session *s, struct channel *req, int an_bit)
return 0; return 0;
} }
/* This function is an analyser which processes the HTTP request body. It looks /* This function is an analyser which waits for the HTTP request body. It waits
* for parameters to be used for the load balancing algorithm (url_param). It * for either the buffer to be full, or the full advertised contents to have
* must only be called after the standard HTTP request processing has occurred, * reached the buffer. It must only be called after the standard HTTP request
* because it expects the request to be parsed. It returns zero if it needs to * processing has occurred, because it expects the request to be parsed and will
* read more data, or 1 once it has completed its analysis. * look for the Expect header. It may send a 100-Continue interim response. It
* takes in input any state starting from HTTP_MSG_BODY and leaves with one of
* HTTP_MSG_CHK_SIZE, HTTP_MSG_DATA or HTTP_MSG_TRAILERS. It returns zero if it
* needs to read more data, or 1 once it has completed its analysis.
*/ */
int http_process_request_body(struct session *s, struct channel *req, int an_bit) int http_wait_for_request_body(struct session *s, struct channel *req, int an_bit)
{ {
struct http_txn *txn = &s->txn; struct http_txn *txn = &s->txn;
struct http_msg *msg = &s->txn.req; struct http_msg *msg = &s->txn.req;

2
src/session.c
View File

@ -1897,7 +1897,7 @@ struct task *process_session(struct task *t)
} }
if (ana_list & AN_REQ_HTTP_BODY) { if (ana_list & AN_REQ_HTTP_BODY) {
if (!http_process_request_body(s, s->req, AN_REQ_HTTP_BODY)) if (!http_wait_for_request_body(s, s->req, AN_REQ_HTTP_BODY))
break; break;
UPDATE_ANALYSERS(s->req->analysers, ana_list, ana_back, AN_REQ_HTTP_BODY); UPDATE_ANALYSERS(s->req->analysers, ana_list, ana_back, AN_REQ_HTTP_BODY);
} }