*) mod_log_config: Fix LogFormat directive merging

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1922961 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 127f04645bd37b2826f6327c35f3457992818ec3..d6b811c8bcf28f46ff32c8c27873c6e644b3bc90 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -157,12 +157,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_log_config: Fix LogFormat directive merging
-     trunk patch: https://svn.apache.org/r1921305
-                  https://svn.apache.org/r1921306
-     2.4.x patch: svn merge -c 1921305,1921306 ^/httpd/httpd/trunk .
-     +1: jorton, covener, jim
-
   *) mod_lua: Make r.ap_auth_type writable
      trunk patch: https://svn.apache.org/r1921260
      2.4.x patch: svn merge -c 1921260 ^/httpd/httpd/trunk .

diff --git a/changes-entries/pr65222.txt b/changes-entries/pr65222.txt
new file mode 100644 (file)
index 0000000..8efffd6
--- /dev/null
+++ b/changes-entries/pr65222.txt
@@ -0,0 +1,2 @@
+  *) mod_log_config: Fix merging for the "LogFormat" directive.
+     PR: 65222. [Michael Kaufmann <mail michael-kaufmann.ch>]

diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index 5d5b73a1f5da84914918f482a3cea5cc2cb4c02e..5c2d635df8c745780a21fbdd7266c12b91c68ea0 100644 (file)
--- a/modules/loggers/mod_log_config.c
+++ b/modules/loggers/mod_log_config.c
@@ -1257,7 +1257,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;
 }