actually remove mod_reqtimeout, since the util_filter functions involved

only manipulate c->input_filters no matter what we pass. We need to make
copies of c->input_filters after, not before, it skips over reqtimeout.

Note: reqtimeout doesn't really interfere today with normal operation,
but this is misleading/confusing when dealing with other
wstunnel issues.

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

diff --git a/modules/proxy/mod_proxy_wstunnel.c b/modules/proxy/mod_proxy_wstunnel.c
index 57c13aaac6b430fe3357e1608676a6af02dde998..5b64f192b3e143620bbc59fc582528b1089c778c 100644 (file)
--- a/modules/proxy/mod_proxy_wstunnel.c
+++ b/modules/proxy/mod_proxy_wstunnel.c
@@ -368,12 +368,13 @@ static int ap_proxy_wstunnel_request(apr_pool_t *p, request_rec *r,
     apr_pollset_add(pollset, &pollfd);
 
 
+    remove_reqtimeout(c->input_filters);
+
     r->output_filters = c->output_filters;
     r->proto_output_filters = c->output_filters;
     r->input_filters = c->input_filters;
     r->proto_input_filters = c->input_filters;
 
-    remove_reqtimeout(r->input_filters);
 
     baton->r = r;
     baton->pollset = pollset;