Commit 8eca7093 authored by Luca Toscano's avatar Luca Toscano
Browse files

Return HTTP 504 rather than 503 when a proxy timeout is hit. 

Part of the review for PR: 56188



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

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.5.0



  *) mod_proxy_fcgi: Return HTTP 504 rather than 503 in case of proxy timeout.

     [Luca Toscano]



  *) mod_proxy_{ajp,fcgi}: Fix a possible crash when reusing an established

     backend connection, happening with LogLevel trace2 or higher configured,

     or at any log level with compilers not detected as C99 compliant (e.g.

modules/proxy/mod_proxy_fcgi.c

+3 −0
Original line number Diff line number Diff line
@@ -880,6 +880,9 @@ static int fcgi_do_request(apr_pool_t *p, request_rec *r, 
        if (bad_request) {

            return ap_map_http_request_error(rv, HTTP_BAD_REQUEST);

        }

        if (APR_STATUS_IS_TIMEUP(rv)) {

            return HTTP_GATEWAY_TIME_OUT;

        }

        return HTTP_SERVICE_UNAVAILABLE;

    }