httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1698328 - in /httpd/httpd/trunk: CHANGES modules/http/http_request.c server/request.c
Date Fri, 28 Aug 2015 12:55:55 GMT
Author: icing
Date: Fri Aug 28 12:55:55 2015
New Revision: 1698328

URL: http://svn.apache.org/r1698328
Log:
reversal of 1698239 due to nedless loop in t/apache/pr17629.t

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/http/http_request.c
    httpd/httpd/trunk/server/request.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1698328&r1=1698327&r2=1698328&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Aug 28 12:55:55 2015
@@ -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

Modified: httpd/httpd/trunk/modules/http/http_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_request.c?rev=1698328&r1=1698327&r2=1698328&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_request.c (original)
+++ httpd/httpd/trunk/modules/http/http_request.c Fri Aug 28 12:55:55 2015
@@ -613,16 +613,8 @@ AP_DECLARE(void) ap_internal_fast_redire
     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 {
         /*

Modified: httpd/httpd/trunk/server/request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/request.c?rev=1698328&r1=1698327&r2=1698328&view=diff
==============================================================================
--- httpd/httpd/trunk/server/request.c (original)
+++ httpd/httpd/trunk/server/request.c Fri Aug 28 12:55:55 2015
@@ -1964,8 +1964,6 @@ static request_rec *make_sub_request(con
 
     /* 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(con
         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



Mime
View raw message