summaryrefslogtreecommitdiffhomepage
path: root/auto
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2012-06-03 23:21:26 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2012-06-03 23:21:26 +0000
commit4cb4e8d17934cdc3718a02f5dcf56983a8cba304 (patch)
treee94d27a0bf9a891756cb0d61c1f1fc3f730b722a /auto
parent01f1e4d1dc4c740587b4e9d9153c043715105b7a (diff)
downloadnginx-4cb4e8d17934cdc3718a02f5dcf56983a8cba304.tar.gz
nginx-4cb4e8d17934cdc3718a02f5dcf56983a8cba304.tar.bz2
Upstream: least_conn balancer module.
Diffstat (limited to 'auto')
-rw-r--r--auto/modules5
-rw-r--r--auto/options3
-rw-r--r--auto/sources5
3 files changed, 13 insertions, 0 deletions
diff --git a/auto/modules b/auto/modules
index 7d3216b0f..ebea30232 100644
--- a/auto/modules
+++ b/auto/modules
@@ -345,6 +345,11 @@ if [ $HTTP_UPSTREAM_IP_HASH = YES ]; then
HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_IP_HASH_SRCS"
fi
+if [ $HTTP_UPSTREAM_LEAST_CONN = YES ]; then
+ HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_LEAST_CONN_MODULE"
+ HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_LEAST_CONN_SRCS"
+fi
+
if [ $HTTP_UPSTREAM_KEEPALIVE = YES ]; then
HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_KEEPALIVE_MODULE"
HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_KEEPALIVE_SRCS"
diff --git a/auto/options b/auto/options
index 393be4066..11f23c6d6 100644
--- a/auto/options
+++ b/auto/options
@@ -96,6 +96,7 @@ HTTP_FLV=NO
HTTP_MP4=NO
HTTP_GZIP_STATIC=NO
HTTP_UPSTREAM_IP_HASH=YES
+HTTP_UPSTREAM_LEAST_CONN=YES
HTTP_UPSTREAM_KEEPALIVE=YES
# STUB
@@ -243,6 +244,8 @@ use the \"--without-http_limit_conn_module\" option instead"
--without-http_empty_gif_module) HTTP_EMPTY_GIF=NO ;;
--without-http_browser_module) HTTP_BROWSER=NO ;;
--without-http_upstream_ip_hash_module) HTTP_UPSTREAM_IP_HASH=NO ;;
+ --without-http_upstream_least_conn_module)
+ HTTP_UPSTREAM_LEAST_CONN=NO ;;
--without-http_upstream_keepalive_module) HTTP_UPSTREAM_KEEPALIVE=NO ;;
--with-http_perl_module) HTTP_PERL=YES ;;
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"