mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-01-19 00:51:37 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: config: completely remove support for "no option http-use-htx"

Browse Source 
This one used to still be supported, emitting a warning about it being
deprecated and the default since 2.1. Let's remove it now.
This commit is contained in:
Willy Tarreau 2021-06-11 15:34:34 +02:00
parent eb9d90a5a2
commit 9862787e8f
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cfgparse-listen.c
View File

@ -1915,17 +1915,6 @@ stats_error_parsing:
goto out;
}
/* "[no] option http-use-htx" is deprecated */
if (strcmp(cfg_opts2[optnum].name, "http-use-htx") == 0) {
if (kwm ==KWM_NO) {
ha_warning("parsing [%s:%d]: option '%s' is deprecated and ignored."
" The HTX mode is now the only supported mode.\n",
file, linenum, cfg_opts2[optnum].name);
err_code |= ERR_WARN;
}
goto out;
}
curproxy->no_options2 &= ~cfg_opts2[optnum].val;
curproxy->options2 &= ~cfg_opts2[optnum].val;

1
src/proxy.c
View File

@ -109,7 +109,6 @@ const struct cfg_opt cfg_opts2[] =
{ "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 },
{ "http-no-delay", PR_O2_NODELAY, PR_CAP_FE|PR_CAP_BE, 0, PR_MODE_HTTP },
{ "http-use-htx", 0, PR_CAP_FE|PR_CAP_BE, 0, 0 }, // deprecated
{"h1-case-adjust-bogus-client", PR_O2_H1_ADJ_BUGCLI, PR_CAP_FE, 0, PR_MODE_HTTP },
{"h1-case-adjust-bogus-server", PR_O2_H1_ADJ_BUGSRV, PR_CAP_BE, 0, PR_MODE_HTTP },