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 279a781e8e3237bedb6f9724d2d19ef3ce10aaf6..5debec1959d872ed15b32df6e5c78f321c529595 100644 (file)
--- 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 469529d1fa10669f0332aee9f3ba1cd0ae80fe48..731f5e2a60a4766579c90391f15ceb8f82e88a34 100644 (file)
--- 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 },