diff options
| author | Yann Ylavic <ylavic@apache.org> | 2019-04-08 18:46:12 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2019-04-08 18:46:12 +0000 |
| commit | 91f1ba42639c9c8016065d82e4b509e2355d4eef (patch) | |
| tree | 9fa4abe709ec72f3cc2a2ecb541ca2a6c0ae09d1 /modules/filters | |
| parent | 7dfbe461052e900692dc7799dab4c69aa8dd1147 (diff) | |
| download | httpd-91f1ba42639c9c8016065d82e4b509e2355d4eef.tar.gz | |
mod_reqtimeout: fix default_[stage]_rate_factor initializations.
r1853901 lowercased the [stage] for MRT_DEFAULT_[stage]_* macros but missed
to change the ones used in reqtimeout_hooks() to initialize the default rate
factors, leading to no default rate in 2.4.39. Fix that now. PR 63325.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1857129 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/filters')
| -rw-r--r-- | modules/filters/mod_reqtimeout.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/modules/filters/mod_reqtimeout.c b/modules/filters/mod_reqtimeout.c index ce8950b87d..e70496d3d7 100644 --- a/modules/filters/mod_reqtimeout.c +++ b/modules/filters/mod_reqtimeout.c @@ -31,7 +31,7 @@ module AP_MODULE_DECLARE_DATA reqtimeout_module; #define UNSET -1 #define MRT_DEFAULT_handshake_TIMEOUT 0 /* disabled */ #define MRT_DEFAULT_handshake_MAX_TIMEOUT 0 -#define MRT_DEFAULT_handshake_MIN_RATE APR_INT32_MAX +#define MRT_DEFAULT_handshake_MIN_RATE 0 #define MRT_DEFAULT_header_TIMEOUT 20 #define MRT_DEFAULT_header_MAX_TIMEOUT 40 #define MRT_DEFAULT_header_MIN_RATE 500 @@ -220,7 +220,7 @@ static apr_status_t reqtimeout_filter(ap_filter_t *f, if (block == APR_NONBLOCK_READ || mode == AP_MODE_INIT || mode == AP_MODE_EATCRLF) { rv = ap_get_brigade(f->next, bb, mode, block, readbytes); - if (ccfg->cur_stage.rate_factor > 0 && rv == APR_SUCCESS) { + if (ccfg->cur_stage.rate_factor && rv == APR_SUCCESS) { extend_timeout(ccfg, bb); } return rv; @@ -254,7 +254,7 @@ static apr_status_t reqtimeout_filter(ap_filter_t *f, } if (!APR_BRIGADE_EMPTY(bb)) { - if (ccfg->cur_stage.rate_factor > 0) { + if (ccfg->cur_stage.rate_factor) { extend_timeout(ccfg, bb); } @@ -315,7 +315,7 @@ static apr_status_t reqtimeout_filter(ap_filter_t *f, * the real (relevant) bytes to be asked later, within the * currently alloted time. */ - if (ccfg->cur_stage.rate_factor > 0 && rv == APR_SUCCESS + if (ccfg->cur_stage.rate_factor && rv == APR_SUCCESS && mode != AP_MODE_SPECULATIVE) { extend_timeout(ccfg, bb); } @@ -638,17 +638,17 @@ static void reqtimeout_hooks(apr_pool_t *pool) ap_hook_post_read_request(reqtimeout_before_body, NULL, NULL, APR_HOOK_MIDDLE); -#if MRT_DEFAULT_HANDSHAKE_MIN_RATE > 0 +#if MRT_DEFAULT_handshake_MIN_RATE default_handshake_rate_factor = apr_time_from_sec(1) / - MRT_DEFAULT_HANDSHAKE_MIN_RATE; + MRT_DEFAULT_handshake_MIN_RATE; #endif -#if MRT_DEFAULT_HEADER_MIN_RATE > 0 +#if MRT_DEFAULT_header_MIN_RATE default_header_rate_factor = apr_time_from_sec(1) / - MRT_DEFAULT_HEADER_MIN_RATE; + MRT_DEFAULT_header_MIN_RATE; #endif -#if MRT_DEFAULT_BODY_MIN_RATE > 0 +#if MRT_DEFAULT_body_MIN_RATE default_body_rate_factor = apr_time_from_sec(1) / - MRT_DEFAULT_BODY_MIN_RATE; + MRT_DEFAULT_body_MIN_RATE; #endif } |