From: Eric Covener <covener@apache.org>
Date: Sat, 7 May 2011 11:41:59 +0000 (+0000)
Subject: replace recent AJP direct comparisons to APR_TIMEUP with APR_STATUS_IS_TIMEUP.
X-Git-Tag: 2.3.12~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ae5a61329fd7bd6a50c8979ca5ce830557f3835;p=thirdparty%2Fapache%2Fhttpd.git

replace recent AJP direct comparisons to APR_TIMEUP with APR_STATUS_IS_TIMEUP.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1100513 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/ajp_link.c b/modules/proxy/ajp_link.c
index 7b995999823..f8e32ac3d69 100644
--- a/modules/proxy/ajp_link.c
+++ b/modules/proxy/ajp_link.c
@@ -84,7 +84,7 @@ apr_status_t ajp_ilink_receive(apr_socket_t *sock, ajp_msg_t *msg)
     if (status != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_ERR, status, NULL,
                      "ajp_ilink_receive() can't receive header");
-        return (status == APR_TIMEUP ? APR_TIMEUP : AJP_ENO_HEADER);
+        return (APR_STATUS_IS_TIMEUP(status) ? APR_TIMEUP : AJP_ENO_HEADER);
     }
 
     status = ajp_msg_check_header(msg, &blen);
diff --git a/modules/proxy/mod_proxy_ajp.c b/modules/proxy/mod_proxy_ajp.c
index 93dfefc83f0..7b44fcbe34b 100644
--- a/modules/proxy/mod_proxy_ajp.c
+++ b/modules/proxy/mod_proxy_ajp.c
@@ -341,7 +341,7 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
          * we assume it is a request that cause a back-end timeout,
          * but doesn't affect the whole worker.
          */
-        if (status == APR_TIMEUP && conn->worker->s->ping_timeout_set) {
+        if (APR_STATUS_IS_TIMEUP(status) && conn->worker->s->ping_timeout_set) {
             return HTTP_GATEWAY_TIME_OUT;
         }