From 9627882d3b88910f7041a7cdc089349dc4b193c9 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Mon, 12 Mar 2018 12:24:27 +0000 Subject: [PATCH] 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 [Reverted by r1826555] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1826543 13f79535-47bb-0310-9956-ffa450edef68 --- modules/http/http_request.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/http/http_request.c b/modules/http/http_request.c index bc7ae22dc4..8d1607cfc2 100644 --- a/modules/http/http_request.c +++ b/modules/http/http_request.c @@ -480,13 +480,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) { -- 2.40.0