diff options
| author | Yann Ylavic <ylavic@apache.org> | 2016-03-01 13:33:50 +0100 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2016-03-01 13:33:50 +0100 |
| commit | 9a6583a778b65d7336c9860d57f95e832f8ac66d (patch) | |
| tree | 0c95f68f89a615a37ece88407caa3de3e68a0241 /modules/filters | |
| parent | mod_proxy: follow up to r1729826 + r1729847 + r1732986. (diff) | |
| download | apache2-9a6583a778b65d7336c9860d57f95e832f8ac66d.tar.xz apache2-9a6583a778b65d7336c9860d57f95e832f8ac66d.zip | |
Revert r1733054: spurious commit of being-worked mod_reqtimeout changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733055 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/filters')
| -rw-r--r-- | modules/filters/mod_reqtimeout.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/modules/filters/mod_reqtimeout.c b/modules/filters/mod_reqtimeout.c index 2fd44ba5e3..206e621796 100644 --- a/modules/filters/mod_reqtimeout.c +++ b/modules/filters/mod_reqtimeout.c @@ -352,15 +352,6 @@ out: return rv; } -static apr_status_t reqtimeout_pause(ap_filter_t *f, apr_bucket_brigade *bb) -{ - if (!APR_BRIGADE_EMPTY(bb) && AP_BUCKET_IS_EOR(APR_BRIGADE_LAST(bb))) { - reqtimeout_con_cfg *ccfg = f->ctx; - ccfg->timeout_at = 0; - } - return ap_pass_brigade(f->next, bb); -} - static int reqtimeout_init(conn_rec *c) { reqtimeout_con_cfg *ccfg; @@ -378,7 +369,6 @@ static int reqtimeout_init(conn_rec *c) if (ccfg == NULL) { ccfg = apr_pcalloc(c->pool, sizeof(reqtimeout_con_cfg)); ap_set_module_config(c->conn_config, &reqtimeout_module, ccfg); - ap_add_output_filter(reqtimeout_filter_name, ccfg, NULL, c); ap_add_input_filter(reqtimeout_filter_name, ccfg, NULL, c); } @@ -617,14 +607,6 @@ static void reqtimeout_hooks(apr_pool_t *pool) AP_FTYPE_CONNECTION + 8); /* - * We need to pause timeout detection in between requests, for - * speculative and non-blocking reads, so between each outgoing EOR - * and the next pre_read_request call. - */ - ap_register_output_filter(reqtimeout_filter_name, reqtimeout_pause, NULL, - AP_FTYPE_CONNECTION); - - /* * mod_reqtimeout needs to be called before ap_process_http_request (which * is run at APR_HOOK_REALLY_LAST) but after all other protocol modules. * This ensures that it only influences normal http connections and not |