httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r1587040 - /httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c
Date Sun, 13 Apr 2014 17:00:39 GMT
Author: covener
Date: Sun Apr 13 17:00:38 2014
New Revision: 1587040

URL: http://svn.apache.org/r1587040
Log:
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.


Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c?rev=1587040&r1=1587039&r2=1587040&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c Sun Apr 13 17:00:38 2014
@@ -368,12 +368,13 @@ static int ap_proxy_wstunnel_request(apr
     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;



Mime
View raw message