Mercurial > hg > nginx
comparison src/http/ngx_http_upstream.c @ 1707:f3188f6eae1f
$upstream_addr did not contain last address, the bug was introduced in r1659
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 11 Dec 2007 16:26:56 +0000 |
parents | 9242e21d2f8d |
children | edaea30d83be |
comparison
equal
deleted
inserted
replaced
1706:9242e21d2f8d | 1707:f3188f6eae1f |
---|---|
663 ngx_memzero(u->state, sizeof(ngx_http_upstream_state_t)); | 663 ngx_memzero(u->state, sizeof(ngx_http_upstream_state_t)); |
664 | 664 |
665 tp = ngx_timeofday(); | 665 tp = ngx_timeofday(); |
666 u->state->response_sec = tp->sec; | 666 u->state->response_sec = tp->sec; |
667 u->state->response_msec = tp->msec; | 667 u->state->response_msec = tp->msec; |
668 u->state->peer = u->peer.name; | |
669 | 668 |
670 rc = ngx_event_connect_peer(&u->peer); | 669 rc = ngx_event_connect_peer(&u->peer); |
671 | 670 |
672 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | 671 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
673 "http upstream connect: %i", rc); | 672 "http upstream connect: %i", rc); |
675 if (rc == NGX_ERROR) { | 674 if (rc == NGX_ERROR) { |
676 ngx_http_upstream_finalize_request(r, u, | 675 ngx_http_upstream_finalize_request(r, u, |
677 NGX_HTTP_INTERNAL_SERVER_ERROR); | 676 NGX_HTTP_INTERNAL_SERVER_ERROR); |
678 return; | 677 return; |
679 } | 678 } |
679 | |
680 u->state->peer = u->peer.name; | |
680 | 681 |
681 if (rc == NGX_BUSY) { | 682 if (rc == NGX_BUSY) { |
682 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "no live upstreams"); | 683 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "no live upstreams"); |
683 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_NOLIVE); | 684 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_NOLIVE); |
684 return; | 685 return; |