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/10/12 22:01:54 UTC
svn commit: r1021904 - /httpd/httpd/trunk/server/log.c
Author: sf
Date: Tue Oct 12 20:01:53 2010
New Revision: 1021904
URL: http://svn.apache.org/viewvc?rev=1021904&view=rev
Log:
info.file, info.line, and info.status should not be defined for per-request or
per-conn info
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=1021904&r1=1021903&r2=1021904&view=diff
==============================================================================
--- httpd/httpd/trunk/server/log.c (original)
+++ httpd/httpd/trunk/server/log.c Tue Oct 12 20:01:53 2010
@@ -1165,9 +1165,9 @@ static void log_error_core(const char *f
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 *f
}
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;
}