summaryrefslogtreecommitdiffhomepage
path: root/auto
diff options
context:
space:
mode:
authorSergey Kandaurov <pluknet@nginx.com>2020-10-01 12:21:11 +0100
committerSergey Kandaurov <pluknet@nginx.com>2020-10-01 12:21:11 +0100
commit88cb4d3ab046622b2b71e4d94c583d45e00a56c4 (patch)
treea75aca6b6836c224a0030c32569b9cb0d289b417 /auto
parentee4a6024cc0097d8ab29af8441172846de6b0f64 (diff)
parent135b707ab02d5921d7e789c231995f0cc11ae4a6 (diff)
downloadnginx-88cb4d3ab046622b2b71e4d94c583d45e00a56c4.tar.gz
nginx-88cb4d3ab046622b2b71e4d94c583d45e00a56c4.tar.bz2
Merged with the default branch.
Diffstat (limited to 'auto')
-rw-r--r--auto/modules10
-rw-r--r--auto/options3
2 files changed, 13 insertions, 0 deletions
diff --git a/auto/modules b/auto/modules
index e8f773a4f..205023d3a 100644
--- a/auto/modules
+++ b/auto/modules
@@ -1172,6 +1172,16 @@ if [ $STREAM != NO ]; then
. auto/module
fi
+ if [ $STREAM_SET = YES ]; then
+ ngx_module_name=ngx_stream_set_module
+ ngx_module_deps=
+ ngx_module_srcs=src/stream/ngx_stream_set_module.c
+ ngx_module_libs=
+ ngx_module_link=$STREAM_SET
+
+ . auto/module
+ fi
+
if [ $STREAM_UPSTREAM_HASH = YES ]; then
ngx_module_name=ngx_stream_upstream_hash_module
ngx_module_deps=
diff --git a/auto/options b/auto/options
index 450fe729e..e475c7d74 100644
--- a/auto/options
+++ b/auto/options
@@ -127,6 +127,7 @@ STREAM_GEOIP=NO
STREAM_MAP=YES
STREAM_SPLIT_CLIENTS=YES
STREAM_RETURN=YES
+STREAM_SET=YES
STREAM_UPSTREAM_HASH=YES
STREAM_UPSTREAM_LEAST_CONN=YES
STREAM_UPSTREAM_RANDOM=YES
@@ -331,6 +332,7 @@ use the \"--with-mail_ssl_module\" option instead"
--without-stream_split_clients_module)
STREAM_SPLIT_CLIENTS=NO ;;
--without-stream_return_module) STREAM_RETURN=NO ;;
+ --without-stream_set_module) STREAM_SET=NO ;;
--without-stream_upstream_hash_module)
STREAM_UPSTREAM_HASH=NO ;;
--without-stream_upstream_least_conn_module)
@@ -548,6 +550,7 @@ cat << END
--without-stream_split_clients_module
disable ngx_stream_split_clients_module
--without-stream_return_module disable ngx_stream_return_module
+ --without-stream_set_module disable ngx_stream_set_module
--without-stream_upstream_hash_module
disable ngx_stream_upstream_hash_module
--without-stream_upstream_least_conn_module