From: Joe Orton <jorton@apache.org>
Date: Mon, 14 Oct 2024 13:32:37 +0000 (+0000)
Subject: mod_log_config: Fix config merging for the "LogFormat" directive
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca0bb271d3c20e842fd6a378b28828b88d17ee49;p=thirdparty%2Fapache%2Fhttpd.git

mod_log_config: Fix config merging for the "LogFormat" directive

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
---

diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index e515dec26ef..17735b9b3fa 100644
--- a/modules/loggers/mod_log_config.c
+++ b/modules/loggers/mod_log_config.c
@@ -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;
 }