diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2013-03-29 18:16:27 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-03-29 18:16:27 +0000 |
| commit | 4e2bbc23c1564ac1458dc17c5c6c38ca52ae012d (patch) | |
| tree | ab17bf42ecc2266a900993b12bdd0b8c5f6c7685 /src/http/ngx_http_upstream_round_robin.c | |
| parent | f064449ea7067b2efe537c31c43657cd5aa6488a (diff) | |
| download | nginx-4e2bbc23c1564ac1458dc17c5c6c38ca52ae012d.tar.gz nginx-4e2bbc23c1564ac1458dc17c5c6c38ca52ae012d.tar.bz2 | |
Merge of r5133, r5134: peer.free() and peer.get() balance.
*) Upstream: only call peer.free() if peer.get() selected a peer.
*) Upstream: removed double-free workarounds in peer.free() methods.
Diffstat (limited to 'src/http/ngx_http_upstream_round_robin.c')
| -rw-r--r-- | src/http/ngx_http_upstream_round_robin.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c index 61dce69cb..c9ecfb22a 100644 --- a/src/http/ngx_http_upstream_round_robin.c +++ b/src/http/ngx_http_upstream_round_robin.c @@ -584,10 +584,6 @@ ngx_http_upstream_free_round_robin_peer(ngx_peer_connection_t *pc, void *data, ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0, "free rr peer %ui %ui", pc->tries, state); - if (state == 0 && pc->tries == 0) { - return; - } - /* TODO: NGX_PEER_KEEPALIVE */ if (rrp->peers->single) { |