From: Aurelien DARRAGON Date: Tue, 17 Sep 2024 13:30:05 +0000 (+0200) Subject: BUG/MINOR: fix missing "'option httpslog' overrides previous 'option tcplog clf'... X-Git-Tag: v3.1-dev8~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc4bf5779f609a5cf7e6175530a4f1e3c095f6e7;p=thirdparty%2Fhaproxy.git BUG/MINOR: fix missing "'option httpslog' overrides previous 'option tcplog clf'..." detection 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. --- diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c index 876a5da95b..183eee5e38 100644 --- a/src/cfgparse-listen.c +++ b/src/cfgparse-listen.c @@ -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)