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

[sf...@apache.org]

Author: sf
Date: Mon Nov 21 17:01:10 2011
New Revision: 1204595

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

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=1204595&r1=1204594&r2=1204595&view=diff
==============================================================================
--- httpd/httpd/trunk/server/log.c (original)
+++ httpd/httpd/trunk/server/log.c Mon Nov 21 17:01:10 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, c, r,
                              pool, errstr + errstr_start);