From: Stefan Eissing <icing@apache.org>
Date: Fri, 28 Aug 2015 12:55:55 +0000 (+0000)
Subject: reversal of 1698239 due to nedless loop in t/apache/pr17629.t
X-Git-Tag: 2.5.0-alpha~2909
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d999413734c0b9ddcf6e2e54b15289815da2cb9;p=apache

reversal of 1698239 due to nedless loop in t/apache/pr17629.t

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

diff --git a/CHANGES b/CHANGES
index af36d7e4cd..0420ab900c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_dir: Responses that go through "FallbackResource" might appear to
-     hang due to unterminated chunked encoding. PR58292. [Eric Covener]
-
   *) mod_socache_memcache: Add the 'MemcacheConnTTL' directive to control how 
      long to keep idle connections with the memcache server(s).
      Change default value from 600 usec (!) to 15 sec. PR 58091
diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index 03567f4892..70bf2937c0 100644
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -613,16 +613,8 @@ 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_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);
-        }
+        ap_add_output_filter_handle(ap_subreq_core_filter_handle,
+                                    NULL, r, r->connection);
     }
     else {
         /*
diff --git a/server/request.c b/server/request.c
index e86bb892b4..fa84c1ab32 100644
--- a/server/request.c
+++ b/server/request.c
@@ -1964,8 +1964,6 @@ static request_rec *make_sub_request(const request_rec *r,
 
     /* start with the same set of output filters */
     if (next_filter) {
-        ap_filter_t *scan = next_filter;
-
         /* while there are no input filters for a subrequest, we will
          * try to insert some, so if we don't have valid data, the code
          * will seg fault.
@@ -1974,15 +1972,8 @@ static request_rec *make_sub_request(const request_rec *r,
         rnew->proto_input_filters = r->proto_input_filters;
         rnew->output_filters = next_filter;
         rnew->proto_output_filters = r->proto_output_filters;
-        while (scan && (scan != r->proto_output_filters)) {
-            if (scan->frec == ap_subreq_core_filter_handle) {
-                break;
-            }
-        }
-        if (!scan || scan == r->proto_output_filters) {
-            ap_add_output_filter_handle(ap_subreq_core_filter_handle,
-                    NULL, rnew, rnew->connection);
-        }
+        ap_add_output_filter_handle(ap_subreq_core_filter_handle,
+                                    NULL, rnew, rnew->connection);
     }
     else {
         /* If NULL - we are expecting to be internal_fast_redirect'ed