mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2025-02-22 21:56:55 +00:00
BUG/MINOR: config: don't inherit the default balance algorithm in frontends
Tom Limoncelli from Stack Exchange reported a minor bug : the frontend inherits the LB parameters from the defaults sections. The impact is that if a "balance" directive uses any L7 parameter in the defaults sections and the frontend is in TCP mode, a warning is emitted about their incompatibility. The warning is harmless but a valid, sane config should never cause any warning to be reported. This fix should be backported into 1.5 and possibly 1.4.
This commit is contained in:
parent
de898712a0
commit
743c128580
@ -2006,7 +2006,6 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
|
||||
curproxy->no_options = defproxy.no_options;
|
||||
curproxy->no_options2 = defproxy.no_options2;
|
||||
curproxy->bind_proc = defproxy.bind_proc;
|
||||
curproxy->lbprm.algo = defproxy.lbprm.algo;
|
||||
curproxy->except_net = defproxy.except_net;
|
||||
curproxy->except_mask = defproxy.except_mask;
|
||||
curproxy->except_to = defproxy.except_to;
|
||||
@ -2040,6 +2039,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
|
||||
}
|
||||
|
||||
if (curproxy->cap & PR_CAP_BE) {
|
||||
curproxy->lbprm.algo = defproxy.lbprm.algo;
|
||||
curproxy->fullconn = defproxy.fullconn;
|
||||
curproxy->conn_retries = defproxy.conn_retries;
|
||||
curproxy->max_ka_queue = defproxy.max_ka_queue;
|
||||
|
Loading…
Reference in New Issue
Block a user