RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-16 22:58:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: cfgparse: use curproxy global var from config post validation

Browse Source 
Previously check_config_validity() had its own curproxy variable. This
resulted in the acl() sample fetch being unable to determine which
proxy was in use when used from within log-format statements. This
change addresses the issue by having the check_config_validity()
function use the global variable instead.
This commit is contained in:
Patrick Hemmer 2023-08-01 10:55:55 -04:00 committed by Willy Tarreau
parent 93d4e99714
commit 28489021b3
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reg-tests/sample_fetches/acl.vtc
View File

@ -19,6 +19,8 @@ haproxy h1 -conf {
acl ACL4 acl(ACL2,!ACL3) acl ACL4 acl(ACL2,!ACL3)
http-request return status 200 hdr x-acl "ACL1=%[acl(ACL1)] ACL2=%[acl(ACL2)] ACL3=%[acl(ACL3)] ACL4=%[acl(ACL4)] TRUE=%[acl(TRUE)]" http-request return status 200 hdr x-acl "ACL1=%[acl(ACL1)] ACL2=%[acl(ACL2)] ACL3=%[acl(ACL3)] ACL4=%[acl(ACL4)] TRUE=%[acl(TRUE)]"
log-format ACL1=%[acl(ACL1)]
} -start } -start
client c1 -connect ${h1_fe1_sock} { client c1 -connect ${h1_fe1_sock} {

1
src/cfgparse.c
View File

@ -2705,7 +2705,6 @@ static int numa_detect_topology()
int check_config_validity() int check_config_validity()
{ {
int cfgerr = 0; int cfgerr = 0;
struct proxy *curproxy = NULL;
struct proxy *init_proxies_list = NULL; struct proxy *init_proxies_list = NULL;
struct stktable *t; struct stktable *t;
struct server *newsrv = NULL; struct server *newsrv = NULL;