From: Eric Covener Date: Tue, 2 Dec 2008 03:50:34 +0000 (+0000) Subject: add r722213 to backport proposal X-Git-Tag: 2.2.11~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c90c035dc575d02de178bec1fcea6614a5c36fce;p=thirdparty%2Fapache%2Fhttpd.git add r722213 to backport proposal git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@722365 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 94484ad8f54..2f4a7d6964c 100644 --- a/STATUS +++ b/STATUS @@ -91,19 +91,24 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: * core: Allow ap_invoke_handler to pass AP_FILTER_ERROR through as if it were a reserved return code (OK/DECLINED) instead of converting it to - internal server error. Additionally, clear the brigade in - ap_http_header_filter when handling an error bucket. + internal server error. + Additionally: + * Clear the brigade in ap_http_header_filter when handling an error bucket. + * Avoid sending no answer at all if a custom error page causes + an AP_FILTER_ERROR. Trunk version of patch: http://svn.apache.org/viewvc?rev=721679&view=rev http://svn.apache.org/viewvc?rev=722081&view=rev + http://svn.apache.org/viewvc?rev=722213&view=rev Backport version for 2.2.x of updated patch: - http://people.apache.org/~covener/2.2.x-ap_filter_error+clear_brigade.txt - +1: covener, niq + http://people.apache.org/~covener/2.2.x-ap_filter_error+722081+722213.diff + +1: covener rpluem says: 1. There is a bogus entry in your patch to CHANGES 2. I guess we should also consider r722213, because with the current state of the patch we IMHO create a regression in the case that a custom error page results in AP_FILTER_ERROR before sending the page. + covener says: r722213 added and extra CHANGES entry removed (reset niq's +1) PATCHES/ISSUES THAT ARE STALLED