summaryrefslogtreecommitdiffhomepage
path: root/auto
diff options
context:
space:
mode:
authorRoman Arutyunyan <arut@nginx.com>2014-06-02 16:16:22 +0400
committerRoman Arutyunyan <arut@nginx.com>2014-06-02 16:16:22 +0400
commit9b5a17b5e23e8e7c94d84eb85044370e38887849 (patch)
tree4b28bfddc92dec5fddd73d124d1cef7e9a620304 /auto
parent68336e1ede6c37e3ee1f8b5e1ca9d4226feef8f5 (diff)
downloadnginx-9b5a17b5e23e8e7c94d84eb85044370e38887849.tar.gz
nginx-9b5a17b5e23e8e7c94d84eb85044370e38887849.tar.bz2
Upstream: generic hash module.
Diffstat (limited to 'auto')
-rw-r--r--auto/modules5
-rw-r--r--auto/options4
-rw-r--r--auto/sources4
3 files changed, 13 insertions, 0 deletions
diff --git a/auto/modules b/auto/modules
index e1eda943f..788596763 100644
--- a/auto/modules
+++ b/auto/modules
@@ -371,6 +371,11 @@ if [ $HTTP_MP4 = YES ]; then
HTTP_SRCS="$HTTP_SRCS $HTTP_MP4_SRCS"
fi
+if [ $HTTP_UPSTREAM_HASH = YES ]; then
+ HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_HASH_MODULE"
+ HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_HASH_SRCS"
+fi
+
if [ $HTTP_UPSTREAM_IP_HASH = YES ]; then
HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_IP_HASH_MODULE"
HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_IP_HASH_SRCS"
diff --git a/auto/options b/auto/options
index 010a6bbe2..0d296ac60 100644
--- a/auto/options
+++ b/auto/options
@@ -99,6 +99,7 @@ HTTP_FLV=NO
HTTP_MP4=NO
HTTP_GUNZIP=NO
HTTP_GZIP_STATIC=NO
+HTTP_UPSTREAM_HASH=YES
HTTP_UPSTREAM_IP_HASH=YES
HTTP_UPSTREAM_LEAST_CONN=YES
HTTP_UPSTREAM_KEEPALIVE=YES
@@ -251,6 +252,7 @@ use the \"--without-http_limit_conn_module\" option instead"
--without-http_limit_req_module) HTTP_LIMIT_REQ=NO ;;
--without-http_empty_gif_module) HTTP_EMPTY_GIF=NO ;;
--without-http_browser_module) HTTP_BROWSER=NO ;;
+ --without-http_upstream_hash_module) HTTP_UPSTREAM_HASH=NO ;;
--without-http_upstream_ip_hash_module) HTTP_UPSTREAM_IP_HASH=NO ;;
--without-http_upstream_least_conn_module)
HTTP_UPSTREAM_LEAST_CONN=NO ;;
@@ -395,6 +397,8 @@ cat << END
--without-http_limit_req_module disable ngx_http_limit_req_module
--without-http_empty_gif_module disable ngx_http_empty_gif_module
--without-http_browser_module disable ngx_http_browser_module
+ --without-http_upstream_hash_module
+ disable ngx_http_upstream_hash_module
--without-http_upstream_ip_hash_module
disable ngx_http_upstream_ip_hash_module
--without-http_upstream_least_conn_module
diff --git a/auto/sources b/auto/sources
index 13c1531f7..1287782ea 100644
--- a/auto/sources
+++ b/auto/sources
@@ -497,6 +497,10 @@ HTTP_GZIP_STATIC_MODULE=ngx_http_gzip_static_module
HTTP_GZIP_STATIC_SRCS=src/http/modules/ngx_http_gzip_static_module.c
+HTTP_UPSTREAM_HASH_MODULE=ngx_http_upstream_hash_module
+HTTP_UPSTREAM_HASH_SRCS=src/http/modules/ngx_http_upstream_hash_module.c
+
+
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