httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaillet...@apache.org
Subject svn commit: r1605207 - /httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c
Date Tue, 24 Jun 2014 21:47:21 GMT
Author: jailletc36
Date: Tue Jun 24 21:47:21 2014
New Revision: 1605207

URL: http://svn.apache.org/r1605207
Log:
Use ap_remove_input_filter_byhandle instead of duplicating the code.

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=1605207&r1=1605206&r2=1605207&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c Tue Jun 24 21:47:21 2014
@@ -307,29 +307,6 @@ static apr_status_t proxy_wstunnel_trans
     return rv;
 }
 
-/* Search thru the input filters and remove the reqtimeout one */
-static void remove_reqtimeout(ap_filter_t *next)
-{
-    ap_filter_t *reqto = NULL;
-    ap_filter_rec_t *filter;
-
-    filter = ap_get_input_filter_handle("reqtimeout");
-    if (!filter) {
-        return;
-    }
-
-    while (next) {
-        if (next->frec == filter) {
-            reqto = next;
-            break;
-        }
-        next = next->next;
-    }
-    if (reqto) {
-        ap_remove_input_filter(reqto);
-    }
-}
-
 /*
  * process the request and write the response.
  */
@@ -403,7 +380,7 @@ static int proxy_wstunnel_request(apr_po
     pollfd.desc.s = client_socket;
     apr_pollset_add(pollset, &pollfd);
 
-    remove_reqtimeout(c->input_filters);
+    ap_remove_input_filter_byhandle(c->input_filters, "reqtimeout");
 
     r->output_filters = c->output_filters;
     r->proto_output_filters = c->output_filters;



Mime
View raw message