From 2f64c139ef619fceaed9fad9d94823a4e53699cd Mon Sep 17 00:00:00 2001 From: Kaspar Brand Date: Wed, 15 Apr 2015 15:53:00 +0000 Subject: [PATCH] Revert r1672014 - doesn't work as advertised (would break configs where the per-vhost log level is different from the global level) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673838 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 --- server/config.c | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 08ea8def8e..fc3913aef1 100644 --- a/CHANGES +++ b/CHANGES @@ -9,9 +9,6 @@ Changes with Apache 2.5.0 will override other parameters given in the same directive. This could be a missing + or - prefix. PR 52820 [Christophe Jaillet] - *) core: Make sure to also print VirtualHost log messages of level - "warn" or higher at configuration parsing time. [Kaspar Brand] - *) mod_logio: Add LogIOTrackTTFB and %^FB logformat to log the time taken to start writing response headers. [Eric Covener] diff --git a/server/config.c b/server/config.c index 00f982b630..aea1ff1dbd 100644 --- a/server/config.c +++ b/server/config.c @@ -2194,7 +2194,7 @@ AP_CORE_DECLARE(const char *) ap_init_virtual_host(apr_pool_t *p, s->keep_alive = -1; s->keep_alive_max = -1; s->error_log = main_server->error_log; - s->log.level = main_server->log.level; + s->log.level = APLOG_UNSET; s->log.module_levels = NULL; /* useful default, otherwise we get a port of 0 on redirects */ s->port = main_server->port; @@ -2286,7 +2286,6 @@ AP_DECLARE(void) ap_fixup_virtual_hosts(apr_pool_t *p, server_rec *main_server) if (virt->keep_alive_max == -1) virt->keep_alive_max = main_server->keep_alive_max; - virt->log.level = APLOG_UNSET; ap_merge_log_config(&main_server->log, &virt->log); dconf = ap_get_core_module_config(virt->lookup_defaults); -- 2.40.0