diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2013-03-25 13:16:55 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2013-03-25 13:16:55 +0000 |
| commit | 2fd8b271c4ff1474ac52f06051829513169eae17 (patch) | |
| tree | cd71bb11895d800e535e16dbc59ffee2e3c73b54 /src/http/ngx_http_upstream_round_robin.c | |
| parent | 46b469a8ee0aa0837e7b2cbab5341674783cc967 (diff) | |
| download | nginx-2fd8b271c4ff1474ac52f06051829513169eae17.tar.gz nginx-2fd8b271c4ff1474ac52f06051829513169eae17.tar.bz2 | |
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 b48039414..ec7b2897e 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) { |