Mercurial > hg > nginx

changeset 7130:882ad033d43c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream: fixed $upstream_status when upstream returns 503/504. If proxy_next_upstream includes http_503/http_504, and upstream returns 503/504, $upstream_status converted this to 502 for any values except the last one.
author Ruslan Ermilov <ru@nginx.com>
date Wed, 11 Oct 2017 22:04:28 +0300
parents f4cf4f970e6e
children 6a5a91de5b74
files src/http/ngx_http_upstream.c
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -4111,6 +4111,7 @@ ngx_http_upstream_next(ngx_http_request_
     switch (ft_type) {
 
     case NGX_HTTP_UPSTREAM_FT_TIMEOUT:
+    case NGX_HTTP_UPSTREAM_FT_HTTP_504:
         status = NGX_HTTP_GATEWAY_TIME_OUT;
         break;
 
@@ -4118,6 +4119,10 @@ ngx_http_upstream_next(ngx_http_request_
         status = NGX_HTTP_INTERNAL_SERVER_ERROR;
         break;
 
+    case NGX_HTTP_UPSTREAM_FT_HTTP_503:
+        status = NGX_HTTP_SERVICE_UNAVAILABLE;
+        break;
+
     case NGX_HTTP_UPSTREAM_FT_HTTP_403:
         status = NGX_HTTP_FORBIDDEN;
         break;