Keep the subrequest filter in place when a subrequest is

redirected.

PR: 15423

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

diff --git a/CHANGES b/CHANGES
index acb40a7eb657a7dc7fc14c95cd0d342049c9d63a..2f9a367c59205a53d6d4a8b4fdb5d2c6ac56de6e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Keep the subrequest filter in place when a subrequest is 
+     redirected.  PR 15423.  [Jeff Trawick]
+
   *) Allow SSLMutex to select/use the full range of APR locking
      mechanisms available to it. Also, fix the bug that SSLMutex uses
      APR_LOCK_DEFAULT no matter what.  PR 8122  [Jim Jagielski,

diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index d2fe79c83a500985455e1cb61b96cb7057e2be5a..0a21296db73340a971cd060322c1ba3246fb3b7b 100644 (file)
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -397,6 +397,15 @@ static request_rec *internal_internal_redirect(const char *new_uri,
     new->output_filters  = new->proto_output_filters;
     new->input_filters   = new->proto_input_filters;
 
+    if (new->main) {
+        /* Add back the subrequest filter, which we lost when
+         * we set output_filters to include only the protocol
+         * output filters from the original request.
+         */
+        ap_add_output_filter_handle(ap_subreq_core_filter_handle,
+                                    NULL, new, new->connection);
+    }
+    
     update_r_in_filters(new->input_filters, r, new);
     update_r_in_filters(new->output_filters, r, new);