diff options
| author | Eric Covener <covener@apache.org> | 2011-05-07 11:39:29 +0000 |
|---|---|---|
| committer | Eric Covener <covener@apache.org> | 2011-05-07 11:39:29 +0000 |
| commit | c7fba5724cccdf1eff7da1b309c4afc43f37e08b (patch) | |
| tree | 7bdef751703d45b5e5f8b8dc79603c9452316906 | |
| parent | 4670e623f8f6dad15d99d8b484295a9511436b92 (diff) | |
| download | httpd-c7fba5724cccdf1eff7da1b309c4afc43f37e08b.tar.gz | |
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
| -rw-r--r-- | server/protocol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/protocol.c b/server/protocol.c index 62d8bafd1f..55468fc183 100644 --- a/server/protocol.c +++ b/server/protocol.c @@ -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 { |