]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: fix missing "'option httpslog' overrides previous 'option tcplog clf'...
authorAurelien DARRAGON <adarragon@haproxy.com>
Tue, 17 Sep 2024 13:30:05 +0000 (15:30 +0200)
committerAurelien DARRAGON <adarragon@haproxy.com>
Tue, 17 Sep 2024 13:40:02 +0000 (15:40 +0200)
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.

src/cfgparse-listen.c

index 876a5da95b09de2d483c951f350ec5709a787d97..183eee5e387ae73e9fc3155dfa369ed3675407c9 100644 (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)