mod_reqtimeout: Set socket timeout for AP_MODE_INIT.

If the SSL handshake is initiated by ssl_hook_process_connection() in
AP_MODE_INIT mode, we still want to adapt the socket timeout according
to the time left for the handshake.

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

diff --git a/changes-entries/reqtimeout_mode_init.txt b/changes-entries/reqtimeout_mode_init.txt
new file mode 100644 (file)
index 0000000..21ac1bb
--- /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 0ebd78a38e38069088e509acab3af5e39d469c24..0e5afca57e4c8d42faf87238688fe771b6466a8d 100644 (file)
--- 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);