]> git.kaiwu.me - nginx.git/commit
Merge of r4655, r4656, r4657, r4695, r4696: upstream changes.
authorMaxim Dounin <mdounin@mdounin.ru>
Mon, 2 Jul 2012 16:41:13 +0000 (16:41 +0000)
committerMaxim Dounin <mdounin@mdounin.ru>
Mon, 2 Jul 2012 16:41:13 +0000 (16:41 +0000)
commiteaf3544e15cc7551efa128ed5bb67851cb57d11e
treee20e507b071e05890536f6d91319ffcaa0858ffa
parentbb612f1336ec34f6f73f5b4b0b8cb3d9fb99e53f
Merge of r4655, r4656, r4657, r4695, r4696: upstream changes.

*) Upstream: least_conn balancer module.

*) Upstream: weights and IPv6 support in ip_hash balancer.

*) Upstream keepalive: "single" parameter deprecated.
auto/modules
auto/options
auto/sources
src/http/modules/ngx_http_upstream_ip_hash_module.c
src/http/modules/ngx_http_upstream_keepalive_module.c
src/http/modules/ngx_http_upstream_least_conn_module.c [new file with mode: 0644]
src/http/ngx_http_upstream_round_robin.c
src/http/ngx_http_upstream_round_robin.h