httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1641376 - /httpd/httpd/trunk/modules/filters/mod_reqtimeout.c
Date Mon, 24 Nov 2014 11:42:16 GMT
Author: ylavic
Date: Mon Nov 24 11:42:16 2014
New Revision: 1641376

URL: http://svn.apache.org/r1641376
Log:
mod_reqtimeout: don't extend the timeout in speculative mode, wait for the
real (relevant) bytes to be asked later, within the currently alloted time.
This applies to blocking reads only since r1621453 already bypassed the
filter for nonblocking ones.

Modified:
    httpd/httpd/trunk/modules/filters/mod_reqtimeout.c

Modified: httpd/httpd/trunk/modules/filters/mod_reqtimeout.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_reqtimeout.c?rev=1641376&r1=1641375&r2=1641376&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_reqtimeout.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_reqtimeout.c Mon Nov 24 11:42:16 2014
@@ -311,7 +311,12 @@ static apr_status_t reqtimeout_filter(ap
     else {
         /* mode != AP_MODE_GETLINE */
         rv = ap_get_brigade(f->next, bb, mode, block, readbytes);
-        if (ccfg->min_rate > 0 && rv == APR_SUCCESS) {
+        /* Don't extend the timeout in speculative mode, wait for
+         * the real (relevant) bytes to be asked later, within the
+         * currently alloted time.
+         */
+        if (ccfg->min_rate > 0 && rv == APR_SUCCESS
+                && mode != AP_MODE_SPECULATIVE) {
             extend_timeout(ccfg, bb);
         }
     }



Mime
View raw message