svn commit: r1005656 - in /httpd/httpd/branches/2.0.x: CHANGES STATUS modules/http/http_request.c

[wr...@apache.org]

Author: wrowe
Date: Thu Oct  7 22:29:47 2010
New Revision: 1005656

URL: http://svn.apache.org/viewvc?rev=1005656&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.0.x/CHANGES
    httpd/httpd/branches/2.0.x/STATUS
    httpd/httpd/branches/2.0.x/modules/http/http_request.c

Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/CHANGES?rev=1005656&r1=1005655&r2=1005656&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Thu Oct  7 22:29:47 2010
@@ -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 

Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/STATUS?rev=1005656&r1=1005655&r2=1005656&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Thu Oct  7 22:29:47 2010
@@ -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. ]

Modified: httpd/httpd/branches/2.0.x/modules/http/http_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/modules/http/http_request.c?rev=1005656&r1=1005655&r2=1005656&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/http/http_request.c (original)
+++ httpd/httpd/branches/2.0.x/modules/http/http_request.c Thu Oct  7 22:29:47 2010
@@ -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);
     }