From: Jim Jagielski Date: Tue, 7 Jan 2025 15:07:17 +0000 (+0000) Subject: *) mod_log_config: Fix LogFormat directive merging X-Git-Tag: 2.4.63-candidate~50 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9248113bed1c5c0c610c7108b447314cf2847fdc;p=thirdparty%2Fapache%2Fhttpd.git *) 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 127f04645bd..d6b811c8bcf 100644 --- 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 index 00000000000..8efffd6d20b --- /dev/null +++ b/changes-entries/pr65222.txt @@ -0,0 +1,2 @@ + *) mod_log_config: Fix merging for the "LogFormat" directive. + PR: 65222. [Michael Kaufmann ] diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c index 5d5b73a1f5d..5c2d635df8c 100644 --- 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; }