Fix infinite loop when reading certain data due to two HTTP_IN filters being

present for internally redirected requests.

If HTTP_IN is present, r->proto_input_filters would have it, so adding it
twice is wrong.

PR: 10146
Reviewed by:	Brian Pane

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

diff --git a/CHANGES b/CHANGES
index 0c723ddb10dc5d073e8a7260c9b74d3beb93c537..bfae68757be6573d9d382ace82a26e7f39c89dd2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.40
 
+  *) Fix infinite loop due to two HTTP_IN filters being present for
+     internally redirected requests.  PR 10146.  [Justin Erenkrantz]
+
   *) Switch conn_rec->keepalive to an enumeration rather than a bitfield.
      [Justin Erenkrantz]
 

diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index b3763d6e16ffa2df77ed6d7fa80a1a2140735c88..bd9c08595658feb02ce6a712e61ac39a609ac6af 100644 (file)
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -383,8 +383,6 @@ static request_rec *internal_internal_redirect(const char *new_uri,
         f = f->next;
     }
 
-    ap_add_input_filter("HTTP_IN", NULL, new, new->connection);
-
     apr_table_setn(new->subprocess_env, "REDIRECT_STATUS",
                    apr_itoa(r->pool, r->status));