If we are doing a fast_redirect, and we don't have a main request, then

make sure that we don't have the sub_req_output_filter.  This was
causing problems when there were multiple sub_Requests, and some should
have had the filter, but the last one shouldn't.

This fixes the final known bug in 2.0.35

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94470 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index 9eabe3b56c3e4ad1b441abd75163b3d54d1d804d..88e1434511143860536a1cbaf909c1ea05b46037 100644 (file)
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -442,6 +442,10 @@ AP_DECLARE(void) ap_internal_fast_redirect(request_rec *rr, request_rec *r)
         ap_add_output_filter_handle(ap_subreq_core_filter_handle,
                                     NULL, r, r->connection);
     }
+    else if (r->output_filters->frec == ap_subreq_core_filter_handle) {
+        ap_remove_output_filter(r->output_filters);
+        r->output_filters = r->output_filters->next;
+    }
 }
 
 AP_DECLARE(void) ap_internal_redirect(const char *new_uri, request_rec *r)