mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2024-12-18 09:24:31 +00:00
BUG/MINOR: cfgparse: remove the correct option on httpcheck send-state warning
In GH issue #2586 @Bbulatov reported a bug where the http-check
send-state flag is removed from options instead of options2 when
http-check is disabled. It only has an effect when this option is
set and http-check disabled, where it displays a warning indicating
this will be ignored. The option removed instead is srvtcpka when
this happens. It's likely that both options being so minor, nobody
ever faced it.
This can be backported to all versions.
(cherry picked from commit d8194fab82
)
Signed-off-by: Amaury Denoyelle <adenoyelle@haproxy.com>
This commit is contained in:
parent
5590ada473
commit
6d0ac5d07a
@ -3053,7 +3053,7 @@ init_proxies_list_stage1:
|
|||||||
ha_warning("'%s' will be ignored for %s '%s' (requires 'option httpchk').\n",
|
ha_warning("'%s' will be ignored for %s '%s' (requires 'option httpchk').\n",
|
||||||
"send-state", proxy_type_str(curproxy), curproxy->id);
|
"send-state", proxy_type_str(curproxy), curproxy->id);
|
||||||
err_code |= ERR_WARN;
|
err_code |= ERR_WARN;
|
||||||
curproxy->options &= ~PR_O2_CHK_SNDST;
|
curproxy->options2 &= ~PR_O2_CHK_SNDST;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user