Mercurial > hg > nginx
changeset 5132:9bcf89ca78d2
Upstream: only call peer.free() if peer.get() selected a peer.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Mon, 25 Mar 2013 13:14:49 +0000 |
parents | 566cd32d8bac |
children | 089a662c17d1 |
files | src/http/ngx_http_upstream.c |
diffstat | 1 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c Fri Mar 22 15:47:18 2013 +0000 +++ b/src/http/ngx_http_upstream.c Mon Mar 25 13:14:49 2013 +0000 @@ -3147,14 +3147,16 @@ 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 (ft_type != NGX_HTTP_UPSTREAM_FT_NOLIVE) { + if (u->peer.sockaddr) { + + if (ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_404) { + state = NGX_PEER_NEXT; + } else { + state = NGX_PEER_FAILED; + } + 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 @@ 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) {