From d2f2537d1b0b0e4f7da3740aa7270b04af8f7def Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 11 Jun 2021 16:06:29 +0200 Subject: [PATCH] MINOR: config: remove deprecated option "http-tunnel" 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. --- src/cfgparse-listen.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c index d014b8ce0..29778a18c 100644 --- a/src/cfgparse-listen.c +++ b/src/cfgparse-listen.c @@ -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; }