upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-05-28 04:12:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

MINOR: cfgparse: fix *thread keywords sensitive to global section position

Browse source 
*thread keywords parsers are sensitive to global section position. If they are
present there, the global section must be the first section in the
configuration. *thread parsers logic is based on non_global_section_parsed
counter. So, we need to reset it explicitly before the second configuration
read done by worker or in a standalone mode.
This commit is contained in:
Valentine Krasnobaeva 2024-10-15 15:21:47 +02:00 committed by Willy Tarreau
parent 0ed262d7bf
commit 223caab96f
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/haproxy.c
View file

@ -2214,6 +2214,13 @@ static void init(int argc, char **argv)
/* worker, daemon, foreground mode reads the rest of the config */
if (!(global.mode & MODE_MWORKER)) {
/* nbthread and *thread keywords parsers are sensible to global
* section position, it should be placed as the first in
* the configuration, if these keywords are inside. So, let's
* reset non_global_section_parsed counter for the second
* configuration reading
*/
non_global_section_parsed = 0;
if (read_cfg(progname) < 0) {
list_for_each_entry_safe(cfg, cfg_tmp, &cfg_cfgfiles, list) {
ha_free(&cfg->content);