From: Stefan Fritsch <sf@apache.org>
Date: Tue, 15 Jun 2010 17:32:36 +0000 (+0000)
Subject: Change log_error_core to prefer s over c->base_server for loglevel
X-Git-Tag: 2.3.7~174
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6639073375befc62da3235e195f97bdf21d0673f;p=apache

Change log_error_core to prefer s over c->base_server for loglevel
configuration.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@954976 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/log.c b/server/log.c
index db3ae273ec..a5ba651b59 100644
--- a/server/log.c
+++ b/server/log.c
@@ -582,8 +582,8 @@ static void log_error_core(const char *file, int line, int module_index,
         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) {
             /*