RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-04 23:29:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MINOR] option httpclose is now checked both in FE and BE

Browse Source 
The "httpclose" option affects both frontend and backend, so it
was logical to check for its presence at both places. A request
which traverses either a frontend or a backend with this option
set will have a "Connection: close" header appended.
This commit is contained in:
Willy Tarreau 2006-12-30 23:43:54 +01:00
parent ebd6160dd3
commit e01954f45e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/proto_http.c
View File

@ -585,8 +585,9 @@ int process_cli(struct session *t)
/* 3: We might need to remove "connection:" */ /* 3: We might need to remove "connection:" */
if (!delete_header && (t->fe->options & PR_O_HTTP_CLOSE) if (!delete_header &&
&& (strncasecmp(sol, "Connection:", 11) == 0)) { ((t->fe->options | t->be->beprm->options) & PR_O_HTTP_CLOSE) &&
(strncasecmp(sol, "Connection:", 11) == 0)) {
delete_header = 1; delete_header = 1;
} }
@ -1175,7 +1176,7 @@ int process_cli(struct session *t)
* FIXME: this should depend on both the frontend and the backend. * FIXME: this should depend on both the frontend and the backend.
* Header removals should be performed when the filters are run. * Header removals should be performed when the filters are run.
*/ */
if (t->fe->options & PR_O_HTTP_CLOSE) { if ((t->fe->options | t->be->beprm->options) & PR_O_HTTP_CLOSE) {
int len; int len;
len = buffer_replace2(req, req->data + t->hreq.eoh, len = buffer_replace2(req, req->data + t->hreq.eoh,
req->data + t->hreq.eoh, "Connection: close\r\n", 19); req->data + t->hreq.eoh, "Connection: close\r\n", 19);
@ -1902,7 +1903,7 @@ int process_srv(struct session *t)
} }
/* add a "connection: close" line if needed */ /* add a "connection: close" line if needed */
if (t->fe->options & PR_O_HTTP_CLOSE) if ((t->fe->options | t->be->beprm->options) & PR_O_HTTP_CLOSE)
buffer_replace2(rep, rep->h, rep->h, "Connection: close\r\n", 19); buffer_replace2(rep, rep->h, rep->h, "Connection: close\r\n", 19);
t->srv_state = SV_STDATA; t->srv_state = SV_STDATA;
@ -2021,8 +2022,9 @@ int process_srv(struct session *t)
debug_hdr("srvhdr", t, rep->h, ptr); debug_hdr("srvhdr", t, rep->h, ptr);
/* remove "connection: " if needed */ /* remove "connection: " if needed */
if (!delete_header && (t->fe->options & PR_O_HTTP_CLOSE) if (!delete_header &&
&& (strncasecmp(rep->h, "Connection: ", 12) == 0)) { ((t->fe->options | t->be->beprm->options) & PR_O_HTTP_CLOSE) &&
(strncasecmp(rep->h, "Connection: ", 12) == 0)) {
delete_header = 1; delete_header = 1;
} }