diff options
| author | Joe Orton <jorton@apache.org> | 2024-10-14 15:32:37 +0200 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2024-10-14 15:32:37 +0200 |
| commit | ca0bb271d3c20e842fd6a378b28828b88d17ee49 (patch) | |
| tree | 2d18f18a9904de23631e0700c35a7322a2cfaf84 /modules | |
| parent | fr doc rebuild. (diff) | |
| download | apache2-ca0bb271d3c20e842fd6a378b28828b88d17ee49.tar.xz apache2-ca0bb271d3c20e842fd6a378b28828b88d17ee49.zip | |
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
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/loggers/mod_log_config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c index e515dec26e..17735b9b3f 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; } |