You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2010/06/15 19:32:37 UTC

svn commit: r954976 - /httpd/httpd/trunk/server/log.c

Author: sf
Date: Tue Jun 15 17:32:36 2010
New Revision: 954976

URL: http://svn.apache.org/viewvc?rev=954976&view=rev
Log:
Change log_error_core to prefer s over c->base_server for loglevel
configuration.

Modified:
    httpd/httpd/trunk/server/log.c

Modified: httpd/httpd/trunk/server/log.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/log.c?rev=954976&r1=954975&r2=954976&view=diff
==============================================================================
--- httpd/httpd/trunk/server/log.c (original)
+++ httpd/httpd/trunk/server/log.c Tue Jun 15 17:32:36 2010
@@ -582,8 +582,8 @@ static void log_error_core(const char *f
         logf = stderr_log;
     }
     else {
-        int configured_level = r ? ap_get_request_module_loglevel(r, module_index) :
-                               c ? ap_get_conn_module_loglevel(c, module_index) :
+        int configured_level = r ? ap_get_request_module_loglevel(r, module_index)        :
+                               c ? ap_get_conn_server_module_loglevel(c, s, module_index) :
                                    ap_get_server_module_loglevel(s, module_index);
         if (s->error_log) {
             /*