Commit 58353842 authored by Eric Covener's avatar Eric Covener
Browse files

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
parent 79691c38

modules/proxy/ajp_link.c

+1 −1
Changes for modules/proxy/ajp_link.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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);

modules/proxy/mod_proxy_ajp.c

+1 −1
Changes for modules/proxy/mod_proxy_ajp.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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;

        }