Commit 01e154fd authored by Eric Covener's avatar Eric Covener
Browse files

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



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1100512 13f79535-47bb-0310-9956-ffa450edef68
parent 5c06dbd5

server/protocol.c

+2 −2
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ static int read_request_line(request_rec *r, apr_bucket_brigade *bb) 
                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_core(request_rec *r, apr_bucket_brigade *bb 
                         &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 {