# HG changeset patch # User Igor Sysoev # Date 1197390416 0 # Node ID f3188f6eae1f74567cf064c741bc8668453ed994 # Parent 9242e21d2f8dac00f3d0dcdf254e73abd7b8e4b1 $upstream_addr did not contain last address, the bug was introduced in r1659 diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -665,7 +665,6 @@ ngx_http_upstream_connect(ngx_http_reque tp = ngx_timeofday(); u->state->response_sec = tp->sec; u->state->response_msec = tp->msec; - u->state->peer = u->peer.name; rc = ngx_event_connect_peer(&u->peer); @@ -678,6 +677,8 @@ ngx_http_upstream_connect(ngx_http_reque return; } + u->state->peer = u->peer.name; + if (rc == NGX_BUSY) { ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "no live upstreams"); ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_NOLIVE);