Skip to content

Commit 21f4c1e

Browse files
committed
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
1 parent 7bdbfa9 commit 21f4c1e

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

STATUS

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,19 +91,24 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
9191

9292
* core: Allow ap_invoke_handler to pass AP_FILTER_ERROR through as if it
9393
were a reserved return code (OK/DECLINED) instead of converting it to
94-
internal server error. Additionally, clear the brigade in
95-
ap_http_header_filter when handling an error bucket.
94+
internal server error.
95+
Additionally:
96+
* Clear the brigade in ap_http_header_filter when handling an error bucket.
97+
* Avoid sending no answer at all if a custom error page causes
98+
an AP_FILTER_ERROR.
9699
Trunk version of patch:
97100
http://svn.apache.org/viewvc?rev=721679&view=rev
98101
http://svn.apache.org/viewvc?rev=722081&view=rev
102+
http://svn.apache.org/viewvc?rev=722213&view=rev
99103
Backport version for 2.2.x of updated patch:
100-
http://people.apache.org/~covener/2.2.x-ap_filter_error+clear_brigade.txt
101-
+1: covener, niq
104+
http://people.apache.org/~covener/2.2.x-ap_filter_error+722081+722213.diff
105+
+1: covener
102106
rpluem says: 1. There is a bogus entry in your patch to CHANGES
103107
2. I guess we should also consider r722213, because
104108
with the current state of the patch we IMHO create
105109
a regression in the case that a custom error page
106110
results in AP_FILTER_ERROR before sending the page.
111+
covener says: r722213 added and extra CHANGES entry removed (reset niq's +1)
107112

108113
PATCHES/ISSUES THAT ARE STALLED
109114

0 commit comments

Comments
 (0)