IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Upstream: least_conn compilation fixes.

Browse Source 
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.
This commit is contained in:
Maxim Dounin 2012-06-04 00:00:28 +00:00
parent 1ba6ecd4f3
commit 4888969baa
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/http/modules/ngx_http_upstream_least_conn_module.c
View File

@ -122,7 +122,6 @@ static ngx_int_t
ngx_http_upstream_init_least_conn_peer(ngx_http_request_t *r, ngx_http_upstream_init_least_conn_peer(ngx_http_request_t *r,
ngx_http_upstream_srv_conf_t *us) ngx_http_upstream_srv_conf_t *us)
{ {
ngx_int_t rc;
ngx_http_upstream_lc_peer_data_t *lcp; ngx_http_upstream_lc_peer_data_t *lcp;
ngx_http_upstream_least_conn_conf_t *lcf; 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; 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) { if (ngx_http_upstream_init_round_robin_peer(r, us) != NGX_OK) {
return NGX_ERROR; 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); "free least conn peer %ui %ui", pc->tries, state);
if (lcp->rrp.peers->single) { 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) { 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]--; lcp->conns[lcp->rrp.current]--;
return lcp->free_rr_peer(pc, &lcp->rrp, state); lcp->free_rr_peer(pc, &lcp->rrp, state);
} }