summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes-entries/reqtimeout_mode_init.txt1
-rw-r--r--modules/filters/mod_reqtimeout.c3
2 files changed, 2 insertions, 2 deletions
diff --git a/changes-entries/reqtimeout_mode_init.txt b/changes-entries/reqtimeout_mode_init.txt
new file mode 100644
index 0000000000..21ac1bb4f2
--- /dev/null
+++ b/changes-entries/reqtimeout_mode_init.txt
@@ -0,0 +1 @@
+ *) mom_reqtimeout: Fix missing handshake= timeout enforcement. [Yann Ylavic]
diff --git a/modules/filters/mod_reqtimeout.c b/modules/filters/mod_reqtimeout.c
index 0ebd78a38e..0e5afca57e 100644
--- a/modules/filters/mod_reqtimeout.c
+++ b/modules/filters/mod_reqtimeout.c
@@ -217,8 +217,7 @@ static apr_status_t reqtimeout_filter(ap_filter_t *f,
if (rv != APR_SUCCESS)
goto out;
- if (block == APR_NONBLOCK_READ || mode == AP_MODE_INIT
- || mode == AP_MODE_EATCRLF) {
+ if (block == APR_NONBLOCK_READ || mode == AP_MODE_EATCRLF) {
rv = ap_get_brigade(f->next, bb, mode, block, readbytes);
if (ccfg->cur_stage.rate_factor && rv == APR_SUCCESS) {
extend_timeout(ccfg, bb);