From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 12 Mar 2018 15:24:13 +0000 (+0000)
Subject: Fix timeout logging in ap_process_request().
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b959689cb5fe25df6801f667422cd87dfc43368c;p=apache

Fix timeout logging in ap_process_request().

We can't use 'r' after ap_process_request_after_handler(), the core output
filter might have cleaned up its deferred bucket brigade on error, including
the EOR bucket.

Reported by: steffenal
Fixes SpiderLabs/ModSecurity#1542


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

diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index 986ac9d278..0b05b3d842 100644
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -499,13 +499,9 @@ AP_DECLARE(void) ap_process_request(request_rec *r)
              * Notice a timeout as an error message. This might be
              * valuable for detecting clients with broken network
              * connections or possible DoS attacks.
-             *
-             * It is still safe to use r / r->pool here as the eor bucket
-             * could not have been destroyed in the event of a timeout.
              */
-            ap_log_rerror(APLOG_MARK, APLOG_INFO, rv, r, APLOGNO(01581)
-                          "Timeout while writing data for URI %s to the"
-                          " client", r->unparsed_uri);
+            ap_log_cerror(APLOG_MARK, APLOG_INFO, rv, c, APLOGNO(01581)
+                          "flushing data to the client");
         }
     }
     if (ap_extended_status) {