httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kbr...@apache.org
Subject svn commit: r1673838 - in /httpd/httpd/trunk: CHANGES server/config.c
Date Wed, 15 Apr 2015 15:53:00 GMT
Author: kbrand
Date: Wed Apr 15 15:53:00 2015
New Revision: 1673838

URL: http://svn.apache.org/r1673838
Log:
Revert r1672014 - doesn't work as advertised (would break configs
where the per-vhost log level is different from the global level)

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=1673838&r1=1673837&r2=1673838&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed Apr 15 15:53:00 2015
@@ -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]
 

Modified: httpd/httpd/trunk/server/config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/config.c?rev=1673838&r1=1673837&r2=1673838&view=diff
==============================================================================
--- httpd/httpd/trunk/server/config.c (original)
+++ httpd/httpd/trunk/server/config.c Wed Apr 15 15:53:00 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 = 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(
         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);



Mime
View raw message