From 4d0d2b20ac71f6749b2e3a15f28075ec59531c71 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Fri, 16 Nov 2012 12:18:05 +0000 Subject: Upstream: honor the "down" flag for a single server. If an upstream block was defined with the only server marked as "down", e.g. upstream u { server 127.0.0.1:8080 down; } an attempt was made to contact the server despite the "down" flag. It is believed that immediate 502 response is better in such a case, and it's also consistent with what is currently done in case of multiple servers all marked as "down". --- src/http/ngx_http_upstream_round_robin.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c index c4998fca5..4b78cffd8 100644 --- a/src/http/ngx_http_upstream_round_robin.c +++ b/src/http/ngx_http_upstream_round_robin.c @@ -430,6 +430,10 @@ ngx_http_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data) if (rrp->peers->single) { peer = &rrp->peers->peer[0]; + if (peer->down) { + goto failed; + } + } else { /* there are several peers */ -- cgit