diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-06-04 00:00:28 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-06-04 00:00:28 +0000 |
| commit | 4888969baa02f4e0587afea2a9d42e596d042499 (patch) | |
| tree | c1975e4d2799f225b8527e335f94c767a2cdaa60 | |
| parent | 1ba6ecd4f3c5f052ee4d39ef73831229c2312202 (diff) | |
| download | nginx-4888969baa02f4e0587afea2a9d42e596d042499.tar.gz nginx-4888969baa02f4e0587afea2a9d42e596d042499.tar.bz2 | |
Upstream: least_conn compilation fixes.
Removed duplicate call of ngx_http_upstream_init_round_robin_peer()
overlooked during code changes. Rewritten "return lcp->free_rr_peer(...)"
as MSVC doesn't like it.
| -rw-r--r-- | src/http/modules/ngx_http_upstream_least_conn_module.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/http/modules/ngx_http_upstream_least_conn_module.c b/src/http/modules/ngx_http_upstream_least_conn_module.c index bc9a14621..50e68b21b 100644 --- a/src/http/modules/ngx_http_upstream_least_conn_module.c +++ b/src/http/modules/ngx_http_upstream_least_conn_module.c @@ -122,7 +122,6 @@ static ngx_int_t ngx_http_upstream_init_least_conn_peer(ngx_http_request_t *r, ngx_http_upstream_srv_conf_t *us) { - ngx_int_t rc; ngx_http_upstream_lc_peer_data_t *lcp; ngx_http_upstream_least_conn_conf_t *lcf; @@ -141,8 +140,6 @@ ngx_http_upstream_init_least_conn_peer(ngx_http_request_t *r, r->upstream->peer.data = &lcp->rrp; - rc = ngx_http_upstream_init_round_robin_peer(r, us); - if (ngx_http_upstream_init_round_robin_peer(r, us) != NGX_OK) { return NGX_ERROR; } @@ -350,7 +347,8 @@ ngx_http_upstream_free_least_conn_peer(ngx_peer_connection_t *pc, "free least conn peer %ui %ui", pc->tries, state); if (lcp->rrp.peers->single) { - return lcp->free_rr_peer(pc, &lcp->rrp, state); + lcp->free_rr_peer(pc, &lcp->rrp, state); + return; } if (state == 0 && pc->tries == 0) { @@ -359,7 +357,7 @@ ngx_http_upstream_free_least_conn_peer(ngx_peer_connection_t *pc, lcp->conns[lcp->rrp.current]--; - return lcp->free_rr_peer(pc, &lcp->rrp, state); + lcp->free_rr_peer(pc, &lcp->rrp, state); } |