summaryrefslogtreecommitdiffhomepage
path: root/auto/sources
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2012-07-02 16:41:13 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2012-07-02 16:41:13 +0000
commiteaf3544e15cc7551efa128ed5bb67851cb57d11e (patch)
treee20e507b071e05890536f6d91319ffcaa0858ffa /auto/sources
parentbb612f1336ec34f6f73f5b4b0b8cb3d9fb99e53f (diff)
downloadnginx-eaf3544e15cc7551efa128ed5bb67851cb57d11e.tar.gz
nginx-eaf3544e15cc7551efa128ed5bb67851cb57d11e.tar.bz2
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.
Diffstat (limited to '')
-rw-r--r--auto/sources5
1 files changed, 5 insertions, 0 deletions
diff --git a/auto/sources b/auto/sources
index 374ad667c..522d72255 100644
--- a/auto/sources
+++ b/auto/sources
@@ -479,6 +479,11 @@ HTTP_UPSTREAM_IP_HASH_MODULE=ngx_http_upstream_ip_hash_module
HTTP_UPSTREAM_IP_HASH_SRCS=src/http/modules/ngx_http_upstream_ip_hash_module.c
+HTTP_UPSTREAM_LEAST_CONN_MODULE=ngx_http_upstream_least_conn_module
+HTTP_UPSTREAM_LEAST_CONN_SRCS=" \
+ src/http/modules/ngx_http_upstream_least_conn_module.c"
+
+
HTTP_UPSTREAM_KEEPALIVE_MODULE=ngx_http_upstream_keepalive_module
HTTP_UPSTREAM_KEEPALIVE_SRCS=" \
src/http/modules/ngx_http_upstream_keepalive_module.c"