httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1204597 - /httpd/httpd/branches/2.4.x/server/log.c
Date Mon, 21 Nov 2011 17:03:07 GMT
Author: sf
Date: Mon Nov 21 17:03:06 2011
New Revision: 1204597

URL: http://svn.apache.org/viewvc?rev=1204597&view=rev
Log:
Backport r1204595:
Fix logic when to call error_log hook

Modified:
    httpd/httpd/branches/2.4.x/server/log.c

Modified: httpd/httpd/branches/2.4.x/server/log.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/log.c?rev=1204597&r1=1204596&r2=1204597&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/log.c (original)
+++ httpd/httpd/branches/2.4.x/server/log.c Mon Nov 21 17:03:06 2011
@@ -1261,8 +1261,12 @@ static void log_error_core(const char *f
         }
         write_logline(errstr, len, logf, level_and_mask);
 
-        if (!log_format) {
-            /* only pass the real error string to the hook */
+        if (done) {
+            /*
+             * We don't call the error_log hook for per-request/per-conn
+             * lines, and we only pass the actual log message, not the
+             * prefix and suffix.
+             */
             errstr[errstr_end] = '\0';
             ap_run_error_log(file, line, module_index, level, status, s, r, pool,
                              errstr + errstr_start);



Mime
View raw message