1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MINOR: config: remove deprecated option "http-tunnel"

Browse Source 
It was marked as deprecated in 2.1-dev2 and for removal in 2.2, but it
was missed. A warning was already emitted and the doc didn't refer to
it any more, let's now get rid of it.
This commit is contained in:
Willy Tarreau 2021-06-11 16:06:29 +02:00
parent 6ba69841f8
commit d2f2537d1b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cfgparse-listen.c
View File

@ -57,7 +57,7 @@ static const char *common_kw_list[] = {
static const char *common_options[] = {
"httpclose", "http-server-close", "http-keep-alive",
"http-tunnel", "redispatch", "httplog", "tcplog", "tcpka", "httpchk",
"redispatch", "httplog", "tcplog", "tcpka", "httpchk",
"ssl-hello-chk", "smtpchk", "pgsql-check", "redis-check",
"mysql-check", "ldap-check", "spop-check", "tcp-check",
"external-check", "forwardfor", "original-to",
@ -1986,9 +1986,9 @@ stats_error_parsing:
}
}
else if (strcmp(args[1], "http-tunnel") == 0) {
ha_warning("parsing [%s:%d]: the option '%s' is deprecated and will be removed in next version.\n",
ha_alert("parsing [%s:%d]: option '%s' is not supported any more since HAProxy 2.1, please just remove it, it shouldn't be needed.\n",
file, linenum, args[1]);
err_code |= ERR_WARN;
err_code |= ERR_ALERT | ERR_FATAL;
goto out;
}