From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 20 Nov 2014 21:38:53 +0000 (+0000)
Subject: mod_reqtimeout: revert r1640758.
X-Git-Tag: 2.5.0-alpha~3693
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b40c9d5167d776cda316786ded462c6c264d9fbd;p=apache

mod_reqtimeout: revert r1640758.
Unexpected functional change.


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

diff --git a/modules/filters/mod_reqtimeout.c b/modules/filters/mod_reqtimeout.c
index 6538127e04..52b4c42ab8 100644
--- a/modules/filters/mod_reqtimeout.c
+++ b/modules/filters/mod_reqtimeout.c
@@ -164,6 +164,7 @@ static apr_status_t brigade_append(apr_bucket_brigade *bbOut, apr_bucket_brigade
 }
 
 
+#define MIN(x,y) ((x) < (y) ? (x) : (y))
 static apr_status_t reqtimeout_filter(ap_filter_t *f,
                                       apr_bucket_brigade *bb,
                                       ap_input_mode_t mode,
@@ -227,10 +228,8 @@ static apr_status_t reqtimeout_filter(ap_filter_t *f,
     rv = apr_socket_timeout_get(ccfg->socket, &saved_sock_timeout);
     AP_DEBUG_ASSERT(rv == APR_SUCCESS);
 
-    if (time_left < saved_sock_timeout) {
-        rv = apr_socket_timeout_set(ccfg->socket, time_left);
-        AP_DEBUG_ASSERT(rv == APR_SUCCESS);
-    }
+    rv = apr_socket_timeout_set(ccfg->socket, MIN(time_left, saved_sock_timeout));
+    AP_DEBUG_ASSERT(rv == APR_SUCCESS);
 
     if (mode == AP_MODE_GETLINE) {
         /*
@@ -299,10 +298,9 @@ static apr_status_t reqtimeout_filter(ap_filter_t *f,
             if (rv != APR_SUCCESS)
                 break;
 
-            if (time_left < saved_sock_timeout) {
-                rv = apr_socket_timeout_set(ccfg->socket, time_left);
-                AP_DEBUG_ASSERT(rv == APR_SUCCESS);
-            }
+            rv = apr_socket_timeout_set(ccfg->socket,
+                                   MIN(time_left, saved_sock_timeout));
+            AP_DEBUG_ASSERT(rv == APR_SUCCESS);
 
         } while (1);
 
@@ -318,9 +316,7 @@ static apr_status_t reqtimeout_filter(ap_filter_t *f,
         }
     }
 
-    if (saved_sock_timeout != time_left) {
-        apr_socket_timeout_set(ccfg->socket, saved_sock_timeout);
-    }
+    apr_socket_timeout_set(ccfg->socket, saved_sock_timeout);
 
 out:
     if (APR_STATUS_IS_TIMEUP(rv)) {