mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

[MINOR] http: move 1xx handling earlier to eliminate a lot of ifs

Browse Source 
The response 1xx was set too low and required a lot of tests along
the code in order to avoid some processing. We still left the test
after the response rewrite rules so that we can eliminate unwanted
headers if required.
This commit is contained in:
Willy Tarreau 2009-12-22 16:01:27 +01:00
parent 0937bc43cf
commit 63c9e5ffa6
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/proto_http.c
View File

@ -3453,26 +3453,42 @@ int http_process_res_common(struct session *t, struct buffer *rep, int an_bit, s
cur_proxy = t->fe; cur_proxy = t->fe;
} }
/*
* We may be facing a 1xx response (100 continue, 101 switching protocols),
* in which case this is not the right response, and we're waiting for the
* next one. Let's allow this response to go to the client and wait for the
* next one.
*/
if (txn->status < 200) {
hdr_idx_init(&txn->hdr_idx);
buffer_forward(rep, rep->lr - (rep->data + msg->som));
msg->msg_state = HTTP_MSG_RPBEFORE;
txn->status = 0;
rep->analysers |= AN_RES_WAIT_HTTP | an_bit;
return 1;
}
/* we don't have any 1xx status code now */
/* /*
* 4: check for server cookie. * 4: check for server cookie.
*/ */
if ((t->be->cookie_name || t->be->appsession_name || t->fe->capture_name if (t->be->cookie_name || t->be->appsession_name || t->fe->capture_name ||
|| (t->be->options & PR_O_CHK_CACHE)) && txn->status >= 200) (t->be->options & PR_O_CHK_CACHE))
manage_server_side_cookies(t, rep); manage_server_side_cookies(t, rep);
/* /*
* 5: check for cache-control or pragma headers if required. * 5: check for cache-control or pragma headers if required.
*/ */
if ((t->be->options & (PR_O_COOK_NOC | PR_O_CHK_CACHE)) != 0 && txn->status >= 200) if ((t->be->options & (PR_O_COOK_NOC | PR_O_CHK_CACHE)) != 0)
check_response_for_cacheability(t, rep); check_response_for_cacheability(t, rep);
/* /*
* 6: add server cookie in the response if needed * 6: add server cookie in the response if needed
*/ */
if ((t->srv) && !(t->flags & SN_DIRECT) && (t->be->options & PR_O_COOK_INS) && if ((t->srv) && !(t->flags & SN_DIRECT) && (t->be->options & PR_O_COOK_INS) &&
(!(t->be->options & PR_O_COOK_POST) || (txn->meth == HTTP_METH_POST)) && (!(t->be->options & PR_O_COOK_POST) || (txn->meth == HTTP_METH_POST))) {
txn->status >= 200) {
int len; int len;
/* the server is known, it's not the one the client requested, we have to /* the server is known, it's not the one the client requested, we have to
@ -3514,8 +3530,7 @@ int http_process_res_common(struct session *t, struct buffer *rep, int an_bit, s
*/ */
if (((txn->flags & (TX_CACHEABLE | TX_CACHE_COOK | TX_SCK_ANY)) == if (((txn->flags & (TX_CACHEABLE | TX_CACHE_COOK | TX_SCK_ANY)) ==
(TX_CACHEABLE | TX_CACHE_COOK | TX_SCK_ANY)) && (TX_CACHEABLE | TX_CACHE_COOK | TX_SCK_ANY)) &&
(t->be->options & PR_O_CHK_CACHE) && (t->be->options & PR_O_CHK_CACHE)) {
txn->status >= 200) {
/* we're in presence of a cacheable response containing /* we're in presence of a cacheable response containing
* a set-cookie header. We'll block it as requested by * a set-cookie header. We'll block it as requested by
@ -3541,28 +3556,13 @@ int http_process_res_common(struct session *t, struct buffer *rep, int an_bit, s
* only needed for 1.1 responses since we know there is no other * only needed for 1.1 responses since we know there is no other
* Connection header. * Connection header.
*/ */
if (txn->status >= 200 && must_close && (txn->flags & TX_RES_VER_11)) { if (must_close && (txn->flags & TX_RES_VER_11)) {
if (unlikely(http_header_add_tail2(rep, &txn->rsp, &txn->hdr_idx, if (unlikely(http_header_add_tail2(rep, &txn->rsp, &txn->hdr_idx,
"Connection: close", 17)) < 0) "Connection: close", 17)) < 0)
goto return_bad_resp; goto return_bad_resp;
must_close = 0; must_close = 0;
} }
/*
* 9: we may be facing a 1xx response (100 continue, 101 switching protocols),
* in which case this is not the right response, and we're waiting for the
* next one. Let's allow this response to go to the client and wait for the
* next one.
*/
if (txn->status < 200) {
hdr_idx_init(&txn->hdr_idx);
buffer_forward(rep, rep->lr - (rep->data + msg->som));
msg->msg_state = HTTP_MSG_RPBEFORE;
txn->status = 0;
rep->analysers |= AN_RES_WAIT_HTTP | an_bit;
return 1;
}
/************************************************************* /*************************************************************
* OK, that's finished for the headers. We have done what we * * OK, that's finished for the headers. We have done what we *
* could. Let's switch to the DATA state. * * could. Let's switch to the DATA state. *