From: Valentine Krasnobaeva Date: Wed, 14 Aug 2024 18:05:58 +0000 (+0200) Subject: BUG/MINOR: cfgparse-global: remove tune.fast-forward from common_kw_list X-Git-Tag: v3.0.5~37 X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=fa7272951174c9c8000999349b87494fd6eaa5b8;p=haproxy-3.0.git BUG/MINOR: cfgparse-global: remove tune.fast-forward from common_kw_list Remove tune.fast-forward from common_kw_list. It was replaced by 'tune.disable-fast-forward' and it's no longer present in "if..else if.." parser from cfg_parse_global(). Otherwise, it may be shown as the best-match keyword for some tune options, which is now wrong. Should be backported in versions 2.9 and 3.0. (cherry picked from commit 2e6e159ac47468b6b65e9678c9e4d1fe746165e8) Signed-off-by: Christopher Faulet --- diff --git a/src/cfgparse-global.c b/src/cfgparse-global.c index 452c0e5..aae2c01 100644 --- a/src/cfgparse-global.c +++ b/src/cfgparse-global.c @@ -40,8 +40,7 @@ static const char *common_kw_list[] = { "tune.idletimer", "tune.rcvbuf.client", "tune.rcvbuf.server", "tune.sndbuf.client", "tune.sndbuf.server", "tune.pipesize", "tune.http.cookielen", "tune.http.logurilen", "tune.http.maxhdr", - "tune.comp.maxlevel", "tune.pattern.cache-size", - "tune.fast-forward", "uid", "gid", + "tune.comp.maxlevel", "tune.pattern.cache-size", "uid", "gid", "external-check", "user", "group", "nbproc", "maxconn", "ssl-server-verify", "maxconnrate", "maxsessrate", "maxsslrate", "maxcomprate", "maxpipes", "maxzlibmem", "maxcompcpuusage", "ulimit-n",