httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r1100512 - /httpd/httpd/branches/2.2.x/server/protocol.c
Date Sat, 07 May 2011 11:39:29 GMT
Author: covener
Date: Sat May  7 11:39:29 2011
New Revision: 1100512

URL: http://svn.apache.org/viewvc?rev=1100512&view=rev
Log:
Merge r1100511 from trunk:

use APR_STATUS_IS_TIMEUP() instead of direct comparison with APR_TIMEUP.

Submitted By: Ruediger Pluem
Reviewed By: wrowe, rjung, covener
  http://mail-archives.apache.org/mod_mbox/httpd-dev/201105.mbox/%3C4DC4D6A8.7070804@apache.org%3E


Modified:
    httpd/httpd/branches/2.2.x/server/protocol.c

Modified: httpd/httpd/branches/2.2.x/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/protocol.c?rev=1100512&r1=1100511&r2=1100512&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/protocol.c (original)
+++ httpd/httpd/branches/2.2.x/server/protocol.c Sat May  7 11:39:29 2011
@@ -608,7 +608,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;
             }
             return 0;
@@ -694,7 +694,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 {



Mime
View raw message