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

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.

diff --git a/src/cfgparse.c b/src/cfgparse.c
index a24eda8aa66f6d239b285c08aeec2fed69fac8ec..88e86d84d97043bf05e369a2e7b205224c78e3dc 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -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