RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-21 21:12:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MINOR] http request: update the TX_SRV_CONN_KA flag on rewrite

Browse Source 
If we modify the "connection" header we send to the server,
update the TX_SRV_CONN_KA flag.
This commit is contained in:
Willy Tarreau 2009-10-18 21:04:35 +02:00
parent 32b47f42a0
commit 4273664a1b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/proto_http.c
View File

@ -2203,7 +2203,10 @@ int http_process_req_common(struct session *s, struct buffer *req, int an_bit, s
} }
} }
/* We might have to check for "Connection:" */ /* We might have to check for "Connection:". The test for persistent
* connections has already been performed, so we only enter here if
* we are certain the connection is persistent.
*/
if (((s->fe->options | s->be->options) & (PR_O_HTTP_CLOSE|PR_O_FORCE_CLO)) && if (((s->fe->options | s->be->options) & (PR_O_HTTP_CLOSE|PR_O_FORCE_CLO)) &&
!(s->flags & SN_CONN_CLOSED)) { !(s->flags & SN_CONN_CLOSED)) {
char *cur_ptr, *cur_end, *cur_next; char *cur_ptr, *cur_end, *cur_next;
@ -2247,16 +2250,20 @@ int http_process_req_common(struct session *s, struct buffer *req, int an_bit, s
txn->req.eoh += delta; txn->req.eoh += delta;
} }
s->flags |= SN_CONN_CLOSED; s->flags |= SN_CONN_CLOSED;
txn->flags &= ~TX_SRV_CONN_KA; /* keep-alive closed on server side */
} }
} }
old_idx = cur_idx; old_idx = cur_idx;
} }
/* if there was no Connection header and we're in HTTP/1.0, then "close" is implied */ /* if there is no "Connection: keep-alive" header left and we're
* in HTTP/1.0, then non-persistent connection is implied */
if (!(s->flags & SN_CONN_CLOSED) && (msg->sl.rq.v_l == 8) && if (!(s->flags & SN_CONN_CLOSED) && (msg->sl.rq.v_l == 8) &&
(req->data[msg->som + msg->sl.rq.v + 5] == '1') && (req->data[msg->som + msg->sl.rq.v + 5] == '1') &&
(req->data[msg->som + msg->sl.rq.v + 7] == '0')) (req->data[msg->som + msg->sl.rq.v + 7] == '0')) {
s->flags |= SN_CONN_CLOSED; s->flags |= SN_CONN_CLOSED;
txn->flags &= ~TX_SRV_CONN_KA; /* keep-alive closed on server side */
}
} }
/* add request headers from the rule sets in the same order */ /* add request headers from the rule sets in the same order */
for (cur_idx = 0; cur_idx < px->nb_reqadd; cur_idx++) { for (cur_idx = 0; cur_idx < px->nb_reqadd; cur_idx++) {