]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
mod_log_config: Fix config merging for the "LogFormat" directive
authorJoe Orton <jorton@apache.org>
Mon, 14 Oct 2024 13:32:37 +0000 (13:32 +0000)
committerJoe Orton <jorton@apache.org>
Mon, 14 Oct 2024 13:32:37 +0000 (13:32 +0000)
Submitted by: Michael Kaufmann <mail michael-kaufmann.ch>
PR: 65222
Github: closes #490

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1921305 13f79535-47bb-0310-9956-ffa450edef68

modules/loggers/mod_log_config.c

index e515dec26eff530c7fad94663fed3532f1003652..17735b9b3fa16b9c602e7353f95b6a6aaaea13e6 100644 (file)
@@ -1321,7 +1321,7 @@ static void *merge_config_log_state(apr_pool_t *p, void *basev, void *addv)
         add->default_format_string = base->default_format_string;
         add->default_format = base->default_format;
     }
-    add->formats = apr_table_overlay(p, base->formats, add->formats);
+    add->formats = apr_table_overlay(p, add->formats, base->formats);
 
     return add;
 }