From: Tim Duesterhus Date: Tue, 14 May 2019 18:58:01 +0000 (+0200) Subject: MEDIUM: Remove 'option independant-streams' X-Git-Tag: v2.1-dev1~80 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24915a55da26e9ab17d8aaa63c50ac0ad8b91ff4;p=thirdparty%2Fhaproxy.git MEDIUM: Remove 'option independant-streams' It is deprecated with HAProxy 1.5. Time to remove it. --- diff --git a/doc/configuration.txt b/doc/configuration.txt index 279a781e8e..5debec1959 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -6600,10 +6600,6 @@ no option independent-streams data sent to the server. Doing so will typically break large HTTP posts from slow lines, so use it with caution. - Note: older versions used to call this setting "option independant-streams" - with a spelling mistake. This spelling is still supported but - deprecated. - See also : "timeout client", "timeout server" and "timeout tunnel" diff --git a/src/proxy.c b/src/proxy.c index 469529d1fa..731f5e2a60 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -106,7 +106,6 @@ const struct cfg_opt cfg_opts2[] = { "socket-stats", PR_O2_SOCKSTAT, PR_CAP_FE, 0, 0 }, { "tcp-smart-accept", PR_O2_SMARTACC, PR_CAP_FE, 0, 0 }, { "tcp-smart-connect", PR_O2_SMARTCON, PR_CAP_BE, 0, 0 }, - { "independant-streams", PR_O2_INDEPSTR, PR_CAP_FE|PR_CAP_BE, 0, 0 }, { "independent-streams", PR_O2_INDEPSTR, PR_CAP_FE|PR_CAP_BE, 0, 0 }, { "http-use-proxy-header", PR_O2_USE_PXHDR, PR_CAP_FE, 0, PR_MODE_HTTP }, { "http-pretend-keepalive", PR_O2_FAKE_KA, PR_CAP_BE, 0, PR_MODE_HTTP },