From: Aurelien DARRAGON Date: Tue, 17 Sep 2024 13:34:44 +0000 (+0200) Subject: BUG/MINOR: cfgparse-listen: fix option httpslog override warning message X-Git-Tag: v3.1-dev8~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17e52c922b577e1b677098b34e47cd0a85f31e8b;p=thirdparty%2Fhaproxy.git BUG/MINOR: cfgparse-listen: fix option httpslog override warning message "option httpslog" override warning messaged used to be reported as "option httplog", probably as a result of copy paste without adjusting the context. Let's fix that to prevent emitting confusing warning messages The issue exists since 98b930d ("MINOR: ssl: Define a default https log format"), thus it should be backported up to 2.6 --- diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c index 183eee5e38..3109516169 100644 --- a/src/cfgparse-listen.c +++ b/src/cfgparse-listen.c @@ -2214,7 +2214,7 @@ stats_error_parsing: oldlogformat = "option httplog clf"; else if (curproxy->logformat.str == default_https_log_format) oldlogformat = "option httpslog"; - ha_warning("parsing [%s:%d]: 'option httplog' overrides previous '%s' in 'defaults' section.\n", + ha_warning("parsing [%s:%d]: 'option httpslog' overrides previous '%s' in 'defaults' section.\n", file, linenum, oldlogformat); } lf_expr_deinit(&curproxy->logformat);