From: Stefan Fritsch <sf@apache.org>
Date: Tue, 12 Oct 2010 20:01:53 +0000 (+0000)
Subject: info.file, info.line, and info.status should not be defined for per-request or
X-Git-Tag: 2.3.9~333
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39262df91369a1e2e19645e37bc4fe5dcb3c3339;p=apache

info.file, info.line, and info.status should not be defined for per-request or
per-conn info


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

diff --git a/server/log.c b/server/log.c
index f2036a4e1b..3fb928ae1d 100644
--- a/server/log.c
+++ b/server/log.c
@@ -1165,9 +1165,9 @@ static void log_error_core(const char *file, int line, int module_index,
 
     info.s             = s;
     info.c             = c;
-    info.file          = file;
-    info.line          = line;
-    info.status        = status;
+    info.file          = NULL;
+    info.line          = 0;
+    info.status        = 0;
     info.using_syslog  = (logf == NULL);
     info.startup       = ((level & APLOG_STARTUP) == APLOG_STARTUP);
 
@@ -1214,10 +1214,13 @@ static void log_error_core(const char *file, int line, int module_index,
         }
         else {
             /* the actual error message */
-            info.r = r;
-            info.rmain = rmain;
-            info.level = level_and_mask;
+            info.r            = r;
+            info.rmain        = rmain;
+            info.level        = level_and_mask;
             info.module_index = module_index;
+            info.file         = file;
+            info.line         = line;
+            info.status       = status;
             log_format = sconf ? sconf->error_log_format : NULL;
             done = 1;
         }