]> granicus.if.org Git - apache/commit
Merge r1826556, r1826847 from trunk:
authorYann Ylavic <ylavic@apache.org>
Thu, 15 Mar 2018 23:19:12 +0000 (23:19 +0000)
committerYann Ylavic <ylavic@apache.org>
Thu, 15 Mar 2018 23:19:12 +0000 (23:19 +0000)
commitc2041de696876b4a3e3aa6375478510ff8c02fdf
treebc4c72e2a19f205a91fb0a182043b4be0914b361
parent85472f610677628d007ab19af684ac01af923485
Merge r1826556, r1826847 from trunk:

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
Closes SpiderLabs/ModSecurity#1542

Follow up to r1826556: CHANGES entry.

Submitted by: ylavic
Reviewed by: ylavic, covener, rjung

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1826899 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
modules/http/http_request.c