upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-03-23 10:53:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

MINOR: cfgparse-global: parse *env keywords in MODE_DISCOVERY

Browse source 
setenv/resetenv/presetenv/unsetenv keywords should be parsed by master
process and by worker. As some other master parameters could be enabled in
conditional blocks (.if...endif). To achieve this let's tag '*env' keywords
with KWF_DISCOVERY flag.
This commit is contained in:
Valentine Krasnobaeva 2024-10-12 14:45:36 +02:00 committed by Willy Tarreau
parent d11dc11e5a
commit d5ad92c7aa
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/cfgparse-global.c
View file

@ -1577,10 +1577,10 @@ static struct cfg_kw_list cfg_kws = {ILH, {
{ CFG_GLOBAL, "tune.disable-zero-copy-forwarding", cfg_parse_global_tune_forward_opts },
{ CFG_GLOBAL, "tune.chksize", cfg_parse_global_unsupported_opts },
{ CFG_GLOBAL, "nbproc", cfg_parse_global_unsupported_opts },
{ CFG_GLOBAL, "setenv", cfg_parse_global_env_opts },
{ CFG_GLOBAL, "unsetenv", cfg_parse_global_env_opts },
{ CFG_GLOBAL, "resetenv", cfg_parse_global_env_opts },
{ CFG_GLOBAL, "presetenv", cfg_parse_global_env_opts },
{ CFG_GLOBAL, "setenv", cfg_parse_global_env_opts, KWF_DISCOVERY },
{ CFG_GLOBAL, "unsetenv", cfg_parse_global_env_opts, KWF_DISCOVERY },
{ CFG_GLOBAL, "resetenv", cfg_parse_global_env_opts, KWF_DISCOVERY },
{ CFG_GLOBAL, "presetenv", cfg_parse_global_env_opts, KWF_DISCOVERY },
{ 0, NULL, NULL },
}};