Fix recursive ErrorDocument handling, when r->status isn't HTTP_OK

upon first pass through ap_die().

PR: 36090
Backport: r354118
Submitted by: Chris Darroch
Reviewed by: covener, rjung, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1005656 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index f2d557f4c6155c62cd8ab81e2ba7c7cca2599989..273c317dd7561724d2c183f46865f00a01c1e8ff 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -57,6 +57,8 @@ Changes with Apache 2.0.64
      mod_proxy_ftp: Prevent XSS attacks when using wildcards in the path of
      the FTP URL. Discovered by Marc Bevand of Rapid7. [Ruediger Pluem]
 
+  *) Fix recursive ErrorDocument handling. PR 36090 [Chris Darroch]
+
   *) mod_ssl: Do not do overlapping memcpy. PR 45444 [Joe Orton]
 
   *) Add Set-Cookie and Set-Cookie2 to the list of headers allowed to pass 

diff --git a/STATUS b/STATUS
index 131088e60e7eed7063b6a052d014accb6ccd6063..d68de700e1eda0778b0c1f163d258937b8709344 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -113,15 +113,7 @@ CURRENT RELEASE NOTES:
 
 RELEASE SHOWSTOPPERS:
 
-  * Backport 354118: Fix recursive ErrorDocument handling [when r->status isn't
-    HTTP_OK upon first pass through ap_die()]. PR #36090
-    Trunk version of patch:
-       http://svn.apache.org/viewvc?view=rev&revision=354118
-    2.2.x patch:
-       http://svn.apache.org/viewvc?view=rev&revision=355454
-    Backport version for 2.0.x of patch:
-       (trunk version works)
-    +1: covener, rjung, wrowe
+
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]

diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index 95240f2c70954637d5f1247f4d829e02a6ac4996..c80816d2832fd7ba066a835641c80d1258aab476 100644 (file)
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -259,6 +259,7 @@ void ap_process_request(request_rec *r)
         ap_finalize_request_protocol(r);
     }
     else {
+        r->status = HTTP_OK;
         ap_die(access_status, r);
     }