upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-22 14:49:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

BUG/MINOR: fix missing "'option httpslog' overrides previous 'option tcplog clf'..." detection

Browse source 
Same as b85edd44db0 ("BUG/MINOR: fix missing "log-format overrides
previous 'option tcplog clf'..." detection") but for "option httpslog"
keyword.

No backport needed unless fd48b28 ("MINOR: Implements new log format of
option tcplog clf") is.
This commit is contained in:
Aurelien DARRAGON 2024-09-17 15:30:05 +02:00
parent 607b9adc9b
commit bc4bf5779f
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cfgparse-listen.c
View file

@ -2208,6 +2208,8 @@ stats_error_parsing:
oldlogformat = "option httplog";
else if (curproxy->logformat.str == default_tcp_log_format)
oldlogformat = "option tcplog";
else if (curproxy->logformat.str == clf_tcp_log_format)
oldlogformat = "option tcplog clf";
else if (curproxy->logformat.str == clf_http_log_format)
oldlogformat = "option httplog clf";
else if (curproxy->logformat.str == default_https_log_format)