From: Jim Jagielski Date: Fri, 17 Feb 2017 15:37:19 +0000 (+0000) Subject: Merge r1775858 from trunk: X-Git-Tag: 2.4.26~294 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84f2958e3ec51a9d73bd658b09db97614f055c51;p=apache Merge r1775858 from trunk: Return HTTP 504 rather than 503 when a proxy timeout is hit. Part of the review for PR: 56188 Submitted by: elukey Reviewed by: elukey, jim, wrowe git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1783414 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 2b44410c24..90cbce1a96 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache 2.4.26 + *) mod_proxy_fcgi: Return HTTP 504 rather than 503 in case of proxy timeout. + [Luca Toscano] + *) mod_http2: not counting file buckets again stream max buffer limits. Effectively transfering static files in one step from slave to master connection. [Stefan Eissing] diff --git a/STATUS b/STATUS index 573179c8f7..d8876916bf 100644 --- a/STATUS +++ b/STATUS @@ -145,10 +145,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) mod_proxy_fcgi: Return HTTP 504 rather than 503 in case of proxy timeout. - trunk patch: http://svn.apache.org/r1775858 - 2.4 patch: trunk works (modulo CHANGES) - +1: elukey, jim, wrowe PATCHES PROPOSED TO BACKPORT FROM TRUNK: diff --git a/modules/proxy/mod_proxy_fcgi.c b/modules/proxy/mod_proxy_fcgi.c index 415c8cf7fe..3dc74dff93 100644 --- a/modules/proxy/mod_proxy_fcgi.c +++ b/modules/proxy/mod_proxy_fcgi.c @@ -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; }