www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

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

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698328 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Eissing
2015-08-28 12:55:55 +00:00
parent 21ff8a24ca
commit 9d99941373
3 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -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

8
modules/http/http_request.c
View File

@@ -613,17 +613,9 @@ 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);
}
}
else {
/*
* We need to check if we now have the SUBREQ_CORE filter in our filter

9
server/request.c
View File

@@ -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,16 +1972,9 @@ 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);
}
}
else {
/* If NULL - we are expecting to be internal_fast_redirect'ed
* to this subrequest - or this request will never be invoked.