From: Stefan Fritsch <sf@apache.org>
Date: Mon, 21 Nov 2011 17:01:10 +0000 (+0000)
Subject: Fix logic when to call error_log hook
X-Git-Tag: 2.5.0-alpha~7838
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=add3418303b4ba093f941a643b48f6d84a84bf4c;p=apache

Fix logic when to call error_log hook


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

diff --git a/server/log.c b/server/log.c
index a3b294cce1..ac446ffe61 100644
--- a/server/log.c
+++ b/server/log.c
@@ -1261,8 +1261,12 @@ static void log_error_core(const char *file, int line, int module_index,
         }
         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);