svn commit: r1897422 - in /httpd/httpd/trunk: changes-entries/reqtimeout_mode_init.txt modules/filters/mod_reqtimeout.c

[yl...@apache.org]

Author: ylavic
Date: Mon Jan 24 16:08:14 2022
New Revision: 1897422

URL: http://svn.apache.org/viewvc?rev=1897422&view=rev
Log:
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.


Added:
    httpd/httpd/trunk/changes-entries/reqtimeout_mode_init.txt
Modified:
    httpd/httpd/trunk/modules/filters/mod_reqtimeout.c

Added: httpd/httpd/trunk/changes-entries/reqtimeout_mode_init.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/changes-entries/reqtimeout_mode_init.txt?rev=1897422&view=auto
==============================================================================
--- httpd/httpd/trunk/changes-entries/reqtimeout_mode_init.txt (added)
+++ httpd/httpd/trunk/changes-entries/reqtimeout_mode_init.txt Mon Jan 24 16:08:14 2022
@@ -0,0 +1 @@
+  *) mom_reqtimeout: Fix missing handshake= timeout enforcement.  [Yann Ylavic]

Modified: httpd/httpd/trunk/modules/filters/mod_reqtimeout.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_reqtimeout.c?rev=1897422&r1=1897421&r2=1897422&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_reqtimeout.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_reqtimeout.c Mon Jan 24 16:08:14 2022
@@ -217,8 +217,7 @@ static apr_status_t reqtimeout_filter(ap
     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);