$upstream_addr did not contain last address, the bug was introduced in r1659

This commit is contained in:
Igor Sysoev 2007-12-11 16:26:56 +00:00
parent 3fc85af2fc
commit 6d4b5a1f86

View File

@ -665,7 +665,6 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
tp = ngx_timeofday(); tp = ngx_timeofday();
u->state->response_sec = tp->sec; u->state->response_sec = tp->sec;
u->state->response_msec = tp->msec; u->state->response_msec = tp->msec;
u->state->peer = u->peer.name;
rc = ngx_event_connect_peer(&u->peer); rc = ngx_event_connect_peer(&u->peer);
@ -678,6 +677,8 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
return; return;
} }
u->state->peer = u->peer.name;
if (rc == NGX_BUSY) { if (rc == NGX_BUSY) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "no live upstreams"); ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "no live upstreams");
ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_NOLIVE); ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_NOLIVE);