Mercurial > hg > nginx-quic
comparison src/http/modules/ngx_http_upstream_least_conn_module.c @ 5162:ee9a043765ea stable-1.2
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.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Fri, 29 Mar 2013 18:16:27 +0000 |
parents | ac3690ee6c28 |
children |
comparison
equal
deleted
inserted
replaced
5161:a5f7d455e271 | 5162:ee9a043765ea |
---|---|
351 if (lcp->rrp.peers->single) { | 351 if (lcp->rrp.peers->single) { |
352 lcp->free_rr_peer(pc, &lcp->rrp, state); | 352 lcp->free_rr_peer(pc, &lcp->rrp, state); |
353 return; | 353 return; |
354 } | 354 } |
355 | 355 |
356 if (state == 0 && pc->tries == 0) { | |
357 return; | |
358 } | |
359 | |
360 lcp->conns[lcp->rrp.current]--; | 356 lcp->conns[lcp->rrp.current]--; |
361 | 357 |
362 lcp->free_rr_peer(pc, &lcp->rrp, state); | 358 lcp->free_rr_peer(pc, &lcp->rrp, state); |
363 } | 359 } |
364 | 360 |