Keep mod_req clear. Simply scan thru input filters and

remove it within the ws submodule. Nasty, but it keeps
mod_req untouched (for now ;) )

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

diff --git a/modules/filters/mod_reqtimeout.c b/modules/filters/mod_reqtimeout.c
index c7742a7b6c404f991a3711ff515652f696ddcda8..3250efcadece1a6d141745f0ae84b653ace6e7b9 100644 (file)
--- a/modules/filters/mod_reqtimeout.c
+++ b/modules/filters/mod_reqtimeout.c
@@ -177,17 +177,6 @@ static apr_status_t reqtimeout_filter(ap_filter_t *f,
     apr_interval_time_t saved_sock_timeout = UNSET;
     reqtimeout_con_cfg *ccfg = f->ctx;
 
-    /* connections can remove the filter even if configured */
-    if (apr_table_get(f->c->notes, "remove-reqtimeout")) {
-        ap_remove_input_filter(f);
-        return ap_get_brigade(f->next, bb, mode, block, readbytes);
-    }
-
-    /* connections can bypass the filter even if configured */
-    if (apr_table_get(f->c->notes, "bypass-reqtimeout")) {
-        return ap_get_brigade(f->next, bb, mode, block, readbytes);
-    }
-
     if (ccfg->in_keep_alive) {
         /* For this read, the normal keep-alive timeout must be used */
         ccfg->in_keep_alive = 0;

diff --git a/modules/proxy/mod_proxy_wstunnel.c b/modules/proxy/mod_proxy_wstunnel.c
index 75f87cba1d55049ee67f9cf26074a509f7a43402..365a20549e7957989b685aacd942225ee66a02a5 100644 (file)
--- a/modules/proxy/mod_proxy_wstunnel.c
+++ b/modules/proxy/mod_proxy_wstunnel.c
@@ -136,6 +136,29 @@ static int proxy_wstunnel_transfer(request_rec *r, conn_rec *c_i, conn_rec *c_o,
     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.
  */
@@ -166,8 +189,6 @@ static int ap_proxy_wstunnel_request(apr_pool_t *p, request_rec *r,
 
     header_brigade = apr_brigade_create(p, backconn->bucket_alloc);
 
-    apr_table_setn(c->notes, "bypass-reqtimeout", "1");
-
     ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r, "sending request");
 
     rv = ap_proxy_create_hdrbrgd(p, header_brigade, r, conn,
@@ -217,6 +238,8 @@ static int ap_proxy_wstunnel_request(apr_pool_t *p, request_rec *r,
     r->input_filters = c->input_filters;
     r->proto_input_filters = c->input_filters;
 
+    remove_reqtimeout(r->input_filters);
+
     while (1) { /* Infinite loop until error (one side closes the connection) */
         if ((rv = apr_pollset_poll(pollset, -1, &pollcnt, &signalled))
             != APR_SUCCESS) {