diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2013-03-25 13:14:49 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2013-03-25 13:14:49 +0000 |
| commit | 46b469a8ee0aa0837e7b2cbab5341674783cc967 (patch) | |
| tree | d9195cb755ac8c85ed9103904fee4e632289263f | |
| parent | 66f9c0f55210d6063adfe27c406be7307e708a54 (diff) | |
| download | nginx-46b469a8ee0aa0837e7b2cbab5341674783cc967.tar.gz nginx-46b469a8ee0aa0837e7b2cbab5341674783cc967.tar.bz2 | |
Upstream: only call peer.free() if peer.get() selected a peer.
| -rw-r--r-- | src/http/ngx_http_upstream.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 5cd42fe6c..61996cb60 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -3147,14 +3147,16 @@ ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u, ngx_http_busy_unlock(u->conf->busy_lock, &u->busy_lock); #endif - if (ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_404) { - state = NGX_PEER_NEXT; - } else { - state = NGX_PEER_FAILED; - } + if (u->peer.sockaddr) { + + if (ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_404) { + state = NGX_PEER_NEXT; + } else { + state = NGX_PEER_FAILED; + } - if (ft_type != NGX_HTTP_UPSTREAM_FT_NOLIVE) { u->peer.free(&u->peer, u->peer.data, state); + u->peer.sockaddr = NULL; } if (ft_type == NGX_HTTP_UPSTREAM_FT_TIMEOUT) { @@ -3314,8 +3316,9 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r, u->finalize_request(r, rc); - if (u->peer.free) { + if (u->peer.free && u->peer.sockaddr) { u->peer.free(&u->peer, u->peer.data, 0); + u->peer.sockaddr = NULL; } if (u->peer.connection) { |