Backport fix for recursive errordocuments (PR 36090)

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

diff --git a/CHANGES b/CHANGES
index baf0d3d3cddfee90bdac2af15689dd1990ac9db8..e783ffffc6be11c48ca4d59c54f89f54faa8f0b5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@ Changes with Apache 2.2.1
   *) Preserve the Content-Length header for a proxied HEAD response.
      PR 18757.  [Greg Ames]
 
+  *) Fix recursive ErrorDocument handling
+     PR 36090 [Submitted Chris Darroch]
+
 Changes with Apache 2.2.0
 
   *) mod_negotiation: Minor performance tweak by reusing already calculated

diff --git a/STATUS b/STATUS
index 7e47929c8ae5ac15a3c5783b4fad76fbab749d50..328971c1017c3f66ea137f2e4f7d586bc899bf08 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -80,12 +80,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
         http://people.apache.org/~colm/httpd-2.2.0-dbd-win32.patch
       +1: colm, pquerna, niq
 
-    * core: Fix recursive ErrorDocument handling
-      http://svn.apache.org/viewcvs.cgi?rev=354118&view=rev
-      PR: 36090
-      +1: niq, rpluem, jerenkrantz
-
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mod_proxy_balancer: Fix PR37753 (mod_proxy_balancer Stickysession that

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