From: Willy Tarreau Date: Wed, 30 Dec 2009 00:10:35 +0000 (+0100) Subject: [MINOR] config: option forceclose is valid in frontends too X-Git-Tag: v1.3.23~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15c24da81e0c2f20e240cf695c33a592c5217b30;p=thirdparty%2Fhaproxy.git [MINOR] config: option forceclose is valid in frontends too This option was disabled for frontends in the configuration because it was useless in its initial implementation, though it was still checked in the code. Let's officially enable it now. (cherry picked from commit a31e5dff36b0b7a3c831abae1290b9df168fdd6f) --- diff --git a/doc/configuration.txt b/doc/configuration.txt index 18b024bc41..7ccc09c84d 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -715,7 +715,7 @@ monitor-uri X X X - [no] option contstats X X X - [no] option dontlog-normal X X X - [no] option dontlognull X X X - -[no] option forceclose X - X X +[no] option forceclose X X X X option forwardfor X X X X option httpchk X - X X [no] option httpclose X X X X @@ -2202,7 +2202,7 @@ option forceclose no option forceclose Enable or disable active connection closing after response is transferred. May be used in sections : defaults | frontend | listen | backend - yes | no | yes | yes + yes | yes | yes | yes Arguments : none Some HTTP servers do not necessarily close the connections when they receive diff --git a/src/cfgparse.c b/src/cfgparse.c index 27b8902854..dfed794d9a 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -98,7 +98,7 @@ static const struct cfg_opt cfg_opts[] = { "clitcpka", PR_O_TCP_CLI_KA, PR_CAP_FE, 0 }, { "contstats", PR_O_CONTSTATS, PR_CAP_FE, 0 }, { "dontlognull", PR_O_NULLNOLOG, PR_CAP_FE, 0 }, - { "forceclose", PR_O_FORCE_CLO, PR_CAP_BE, 0 }, + { "forceclose", PR_O_FORCE_CLO, PR_CAP_FE | PR_CAP_BE, 0 }, { "http_proxy", PR_O_HTTP_PROXY, PR_CAP_FE | PR_CAP_BE, 0 }, { "httpclose", PR_O_HTTP_CLOSE, PR_CAP_FE | PR_CAP_BE, 0 }, { "keepalive", PR_O_KEEPALIVE, PR_CAP_NONE, 0 },