diff options
| author | Eric Covener <covener@apache.org> | 2015-08-28 00:55:52 +0200 |
|---|---|---|
| committer | Eric Covener <covener@apache.org> | 2015-08-28 00:55:52 +0200 |
| commit | f7a34707da4f9924cdf50fd73223d0cfb4dc9603 (patch) | |
| tree | d624c76ba0c14659123d46f9ce56f3bbae6f0f1f /modules/http | |
| parent | giving ap_array_index a start parameter, adding ap_array_contains (diff) | |
| download | apache2-f7a34707da4f9924cdf50fd73223d0cfb4dc9603.tar.xz apache2-f7a34707da4f9924cdf50fd73223d0cfb4dc9603.zip | |
avoid adding multiple subrequest filters when there are nested subrequests.
Multiple copies of the filter were not stripped properly
during ap_fast_internal_redirect() which left the EOS buckets
stripped out of the brigade. This results in the end-chunk never
going out on the wire for a chunked response.
observed with mainreq -> directoryindex -> FallbackResource
PR58292
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698239 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/http')
| -rw-r--r-- | modules/http/http_request.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/modules/http/http_request.c b/modules/http/http_request.c index 70bf2937c0..03567f4892 100644 --- a/modules/http/http_request.c +++ b/modules/http/http_request.c @@ -613,8 +613,16 @@ AP_DECLARE(void) ap_internal_fast_redirect(request_rec *rr, request_rec *r) update_r_in_filters(r->output_filters, rr, r); if (r->main) { - ap_add_output_filter_handle(ap_subreq_core_filter_handle, - NULL, r, r->connection); + ap_filter_t *next = r->output_filters; + while (next && (next != r->proto_output_filters)) { + if (next->frec == ap_subreq_core_filter_handle) { + break; + } + } + if (!next || next == r->proto_output_filters) { + ap_add_output_filter_handle(ap_subreq_core_filter_handle, + NULL, r, r->connection); + } } else { /* |