Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 03DE0173B2 for ; Thu, 20 Nov 2014 21:39:17 +0000 (UTC) Received: (qmail 52324 invoked by uid 500); 20 Nov 2014 21:39:16 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 52256 invoked by uid 500); 20 Nov 2014 21:39:16 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 52247 invoked by uid 99); 20 Nov 2014 21:39:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Nov 2014 21:39:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Nov 2014 21:38:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8C51C2388A91; Thu, 20 Nov 2014 21:38:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1640823 - /httpd/httpd/trunk/modules/filters/mod_reqtimeout.c Date: Thu, 20 Nov 2014 21:38:53 -0000 To: cvs@httpd.apache.org From: ylavic@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141120213853.8C51C2388A91@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ylavic Date: Thu Nov 20 21:38:53 2014 New Revision: 1640823 URL: http://svn.apache.org/r1640823 Log: mod_reqtimeout: revert r1640758. Unexpected functional change. 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=1640823&r1=1640822&r2=1640823&view=diff ============================================================================== --- httpd/httpd/trunk/modules/filters/mod_reqtimeout.c (original) +++ httpd/httpd/trunk/modules/filters/mod_reqtimeout.c Thu Nov 20 21:38:53 2014 @@ -164,6 +164,7 @@ static apr_status_t brigade_append(apr_b } +#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 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 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 } } - 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)) {