On 13.04.2015 22:05, Ruediger Pluem wrote: > On 04/08/2015 09:33 AM, kbr...@apache.org wrote: >> 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?
Yes, you're right - thanks for the review. It also noticed this in the meantime, and when I tried to come up with a fix, more special cases were turning up (whether main_server->log.level is still at DEFAULT_LOGLEVEL might also have to be taken into account). Hopefully I'll find time for more closely examining this tomorrow. Otherwise I will revert r1672014, as it is clearly not a complete solution yet. Kaspar
