You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2003/02/24 01:57:41 UTC
cvs commit: httpd-2.0/modules/http http_request.c
trawick 2003/02/23 16:57:41
Modified: . CHANGES
modules/http http_request.c
Log:
Keep the subrequest filter in place when a subrequest is
redirected.
PR: 15423
Revision Changes Path
1.1086 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.1085
retrieving revision 1.1086
diff -u -r1.1085 -r1.1086
--- CHANGES 23 Feb 2003 17:12:42 -0000 1.1085
+++ CHANGES 24 Feb 2003 00:57:40 -0000 1.1086
@@ -2,6 +2,9 @@
[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,
1.154 +9 -0 httpd-2.0/modules/http/http_request.c
Index: http_request.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/http/http_request.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- http_request.c 3 Feb 2003 17:53:04 -0000 1.153
+++ http_request.c 24 Feb 2003 00:57:40 -0000 1.154
@@ -397,6 +397,15 @@
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);