upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-03-03 13:50:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

BUG/MINOR: config: server on-marked-* statement is ignored in default-server

Browse source 
Commits e0d1bfb ("[MINOR] Allow shutdown of sessions when a server
becomes unavailable") and eb2c24a ("MINOR: checks: add on-marked-up
option") mentionned that the directive was supported in default-server
but while it can be stated there, it's ignored because the config value
is not copied from the default server upon creation of a new server.
Moving the statement to the "server" lines works fine though. Thanks
to Baptiste Assmann for reporting and diagnosing this bug.

These features were introduced in 1.5-dev6 and 1.5-dev10 respectively,
so no backport is needed.
This commit is contained in:
Willy Tarreau 2014-02-18 10:36:15 +01:00
parent 518ceddebe
commit abd03df9de
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cfgparse.c
View file

@ -4683,6 +4683,8 @@ stats_error_parsing:
newsrv->maxconn = curproxy->defsrv.maxconn;
newsrv->slowstart = curproxy->defsrv.slowstart;
newsrv->onerror = curproxy->defsrv.onerror;
newsrv->onmarkeddown = curproxy->defsrv.onmarkeddown;
newsrv->onmarkedup = curproxy->defsrv.onmarkedup;
newsrv->consecutive_errors_limit
= curproxy->defsrv.consecutive_errors_limit;
#ifdef OPENSSL