summaryrefslogtreecommitdiffhomepage
path: root/auto
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2011-09-15 19:28:18 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2011-09-15 19:28:18 +0000
commit44002e541ffee5ce15c75c42f67251b8dd2f93b3 (patch)
treec3d3b2f0b629e5e0f75cb8e40124429b7deda0b9 /auto
parent2fe0a7a0f6feb13cf777c9e5e635f887e4cd040c (diff)
downloadnginx-44002e541ffee5ce15c75c42f67251b8dd2f93b3.tar.gz
nginx-44002e541ffee5ce15c75c42f67251b8dd2f93b3.tar.bz2
Upstream keepalive module.
Diffstat (limited to 'auto')
-rw-r--r--auto/modules5
-rw-r--r--auto/options2
-rw-r--r--auto/sources5
3 files changed, 12 insertions, 0 deletions
diff --git a/auto/modules b/auto/modules
index b13bcb25b..57f0f89e7 100644
--- a/auto/modules
+++ b/auto/modules
@@ -344,6 +344,11 @@ if [ $HTTP_UPSTREAM_IP_HASH = YES ]; then
HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_IP_HASH_SRCS"
fi
+if [ $HTTP_UPSTREAM_KEEPALIVE = YES ]; then
+ HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_KEEPALIVE_MODULE"
+ HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_KEEPALIVE_SRCS"
+fi
+
if [ $HTTP_STUB_STATUS = YES ]; then
have=NGX_STAT_STUB . auto/have
HTTP_MODULES="$HTTP_MODULES ngx_http_stub_status_module"
diff --git a/auto/options b/auto/options
index f30917c89..2019498c3 100644
--- a/auto/options
+++ b/auto/options
@@ -95,6 +95,7 @@ HTTP_FLV=NO
HTTP_MP4=NO
HTTP_GZIP_STATIC=NO
HTTP_UPSTREAM_IP_HASH=YES
+HTTP_UPSTREAM_KEEPALIVE=YES
# STUB
HTTP_STUB_STATUS=NO
@@ -231,6 +232,7 @@ do
--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_keepalive_module) HTTP_UPSTREAM_KEEPALIVE=NO ;;
--with-http_perl_module) HTTP_PERL=YES ;;
--with-perl_modules_path=*) NGX_PERL_MODULES="$value" ;;
diff --git a/auto/sources b/auto/sources
index 00ec7b3d4..6c973f66b 100644
--- a/auto/sources
+++ b/auto/sources
@@ -475,6 +475,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_KEEPALIVE_MODULE=ngx_http_upstream_keepalive_module
+HTTP_UPSTREAM_KEEPALIVE_SRCS=" \
+ src/http/modules/ngx_http_upstream_keepalive_module.c"
+
+
MAIL_INCS="src/mail"
MAIL_DEPS="src/mail/ngx_mail.h"