On 04/08/2015 09:33 AM, [email protected] wrote: > Author: kbrand > Date: Wed Apr 8 07:33:39 2015 > New Revision: 1672014 > > URL: http://svn.apache.org/r1672014 > Log: > UNSET the VirtualHost's LogLevel just before calling ap_merge_log_config(), > to make sure that the DEFAULT_LOGLEVEL (APLOG_WARNING) is also in effect > when ap_process_config_tree() in main.c:main() walks through the > VirtualHost sections. > > See > https://mail-archives.apache.org/mod_mbox/httpd-dev/201404.mbox/%3C535CC85B.80501%40velox.ch%3E > for one case this is addressing. This reverts the change from r1024427 on > the one hand, but still ensures correct LogLevel merging on the other hand. > > Modified: > httpd/httpd/trunk/CHANGES > httpd/httpd/trunk/server/config.c > > Modified: httpd/httpd/trunk/CHANGES > URL: > http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1672014&r1=1672013&r2=1672014&view=diff > ============================================================================== > --- httpd/httpd/trunk/CHANGES [utf-8] (original) > +++ httpd/httpd/trunk/CHANGES [utf-8] Wed Apr 8 07:33:39 2015 > @@ -1,6 +1,9 @@ > -*- coding: utf-8 > -*- > Changes with Apache 2.5.0 > > + *) 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] > > > Modified: httpd/httpd/trunk/server/config.c > URL: > http://svn.apache.org/viewvc/httpd/httpd/trunk/server/config.c?rev=1672014&r1=1672013&r2=1672014&view=diff > ============================================================================== > --- httpd/httpd/trunk/server/config.c (original) > +++ httpd/httpd/trunk/server/config.c Wed Apr 8 07:33:39 2015 > @@ -2194,7 +2194,7 @@ AP_CORE_DECLARE(const char *) ap_init_vi > s->keep_alive = -1; > s->keep_alive_max = -1; > s->error_log = main_server->error_log; > - s->log.level = APLOG_UNSET; > + s->log.level = main_server->log.level; > s->log.module_levels = NULL; > /* useful default, otherwise we get a port of 0 on redirects */ > s->port = main_server->port; > @@ -2286,6 +2286,7 @@ AP_DECLARE(void) ap_fixup_virtual_hosts( > if (virt->keep_alive_max == -1) > virt->keep_alive_max = main_server->keep_alive_max; > > + virt->log.level = APLOG_UNSET;
Shouldn't we only do that in case that vit->log.level is set to main_server->log.level? Don't we lose the configuration done by the user for this particular host otherwise? > ap_merge_log_config(&main_server ->log, &virt->log); > > dconf = ap_get_core_module_config(virt->lookup_defaults); > > > Regards Rüdiger
