From: Nick Kew <niq@apache.org>
Date: Fri, 9 Dec 2005 11:58:51 +0000 (+0000)
Subject: Backport fix for recursive errordocuments (PR 36090)
X-Git-Tag: 2.2.1~207
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44037b372c00ab60eb0d7278cc1ba347410fb119;p=thirdparty%2Fapache%2Fhttpd.git

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 baf0d3d3cdd..e783ffffc6b 100644
--- 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 7e47929c8ae..328971c1017 100644
--- 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 60b37a46f4b..8ec4295523e 100644
--- 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);
     }