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 0658F231F for ; Sat, 7 May 2011 11:34:46 +0000 (UTC) Received: (qmail 94317 invoked by uid 500); 7 May 2011 11:34:45 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 94250 invoked by uid 500); 7 May 2011 11:34:45 -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 94242 invoked by uid 99); 7 May 2011 11:34:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 May 2011 11:34:44 +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; Sat, 07 May 2011 11:34:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B12952388994; Sat, 7 May 2011 11:34:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1100511 - /httpd/httpd/trunk/server/protocol.c Date: Sat, 07 May 2011 11:34:23 -0000 To: cvs@httpd.apache.org From: covener@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110507113423.B12952388994@eris.apache.org> Author: covener Date: Sat May 7 11:34:23 2011 New Revision: 1100511 URL: http://svn.apache.org/viewvc?rev=1100511&view=rev Log: use APR_STATUS_IS_TIMEUP() instead of direct comparison with APR_TIMEUP. Modified: httpd/httpd/trunk/server/protocol.c Modified: httpd/httpd/trunk/server/protocol.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/protocol.c?rev=1100511&r1=1100510&r2=1100511&view=diff ============================================================================== --- httpd/httpd/trunk/server/protocol.c (original) +++ httpd/httpd/trunk/server/protocol.c Sat May 7 11:34:23 2011 @@ -615,7 +615,7 @@ static int read_request_line(request_rec r->proto_num = HTTP_VERSION(1,0); r->protocol = apr_pstrdup(r->pool, "HTTP/1.0"); } - else if (rv == APR_TIMEUP) { + else if (APR_STATUS_IS_TIMEUP(rv)) { r->status = HTTP_REQUEST_TIME_OUT; } else if (rv == APR_EINVAL) { @@ -710,7 +710,7 @@ AP_DECLARE(void) ap_get_mime_headers_cor &len, r, 0, bb); if (rv != APR_SUCCESS) { - if (rv == APR_TIMEUP) { + if (APR_STATUS_IS_TIMEUP(rv)) { r->status = HTTP_REQUEST_TIME_OUT; } else {