comparison src/http/ngx_http_upstream_round_robin.c @ 5133:089a662c17d1

Upstream: removed double-free workarounds in peer.free() methods.
author Ruslan Ermilov <ru@nginx.com>
date Mon, 25 Mar 2013 13:16:55 +0000
parents c9059bd5445b
children 0811376954e4
comparison
equal deleted inserted replaced
5132:9bcf89ca78d2 5133:089a662c17d1
582 ngx_http_upstream_rr_peer_t *peer; 582 ngx_http_upstream_rr_peer_t *peer;
583 583
584 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0, 584 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
585 "free rr peer %ui %ui", pc->tries, state); 585 "free rr peer %ui %ui", pc->tries, state);
586 586
587 if (state == 0 && pc->tries == 0) {
588 return;
589 }
590
591 /* TODO: NGX_PEER_KEEPALIVE */ 587 /* TODO: NGX_PEER_KEEPALIVE */
592 588
593 if (rrp->peers->single) { 589 if (rrp->peers->single) {
594 pc->tries = 0; 590 pc->tries = 0;
595 return; 591 return;