MEDIUM: http: make keep-alive + httpclose be passive mode

There's no particular reason for having keep-alive + httpclose combine
into forceclose when set in different frontend/backend sections, since
keep-alive does not close anything by default. Let's have this still
combination remain httpclose only.
This commit is contained in:
Willy Tarreau 2014-01-30 00:51:42 +01:00
parent 02bce8be01
commit f8b0e03f49

View File

@ -3568,8 +3568,8 @@ int http_process_req_common(struct session *s, struct channel *req, int an_bit,
(s->be->options & PR_O_HTTP_MODE) == PR_O_HTTP_FCL)
tmp = TX_CON_WANT_CLO;
/* option httpclose + anything other than tunnel => close */
if (tmp != TX_CON_WANT_TUN &&
/* option httpclose + server_close => forceclose */
if (tmp == TX_CON_WANT_SCL &&
((s->fe->options & PR_O_HTTP_MODE) == PR_O_HTTP_PCL ||
(s->be->options & PR_O_HTTP_MODE) == PR_O_HTTP_PCL))
tmp = TX_CON_WANT_CLO;