You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2005/12/09 12:59:00 UTC
svn commit: r355454 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/http/http_request.c
Author: niq
Date: Fri Dec 9 03:58:51 2005
New Revision: 355454
URL: http://svn.apache.org/viewcvs?rev=355454&view=rev
Log:
Backport fix for recursive errordocuments (PR 36090)
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/http/http_request.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=355454&r1=355453&r2=355454&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Dec 9 03:58:51 2005
@@ -4,6 +4,9 @@
*) 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
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=355454&r1=355453&r2=355454&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Dec 9 03:58:51 2005
@@ -80,12 +80,6 @@
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
Modified: httpd/httpd/branches/2.2.x/modules/http/http_request.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/http/http_request.c?rev=355454&r1=355453&r2=355454&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/http/http_request.c (original)
+++ httpd/httpd/branches/2.2.x/modules/http/http_request.c Fri Dec 9 03:58:51 2005
@@ -268,6 +268,7 @@
ap_finalize_request_protocol(r);
}
else {
+ r->status = HTTP_OK;
ap_die(access_status, r);
}