From a8b534d41d0c4189b7bb951fff0bb996499acc1e Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Sun, 13 Apr 2014 17:00:38 +0000 Subject: [PATCH] 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 --- modules/proxy/mod_proxy_wstunnel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/proxy/mod_proxy_wstunnel.c b/modules/proxy/mod_proxy_wstunnel.c index 57c13aaac6..5b64f192b3 100644 --- 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; -- 2.50.1