diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2011-11-14 14:04:42 +0000 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2011-11-14 14:04:42 +0000 |
| commit | 255e20ad21e0495b405d79dc9bb1c472511d86f5 (patch) | |
| tree | a704939f90e5af8af2e1ad84e0f59950b3ad6ad4 /auto | |
| parent | 80e3cba5fdf8b0af17bc95a20e5eeaf13e232490 (diff) | |
| download | nginx-255e20ad21e0495b405d79dc9bb1c472511d86f5.tar.gz nginx-255e20ad21e0495b405d79dc9bb1c472511d86f5.tar.bz2 | |
Renamed ngx_http_limit_zone_module to ngx_http_limit_conn_module.
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/modules | 6 | ||||
| -rw-r--r-- | auto/options | 14 | ||||
| -rw-r--r-- | auto/sources | 4 | ||||
| -rw-r--r-- | auto/summary | 2 |
4 files changed, 18 insertions, 8 deletions
diff --git a/auto/modules b/auto/modules index 57f0f89e7..a8607eefc 100644 --- a/auto/modules +++ b/auto/modules @@ -210,9 +210,9 @@ if [ $HTTP_ACCESS = YES ]; then HTTP_SRCS="$HTTP_SRCS $HTTP_ACCESS_SRCS" fi -if [ $HTTP_LIMIT_ZONE = YES ]; then - HTTP_MODULES="$HTTP_MODULES $HTTP_LIMIT_ZONE_MODULE" - HTTP_SRCS="$HTTP_SRCS $HTTP_LIMIT_ZONE_SRCS" +if [ $HTTP_LIMIT_CONN = YES ]; then + HTTP_MODULES="$HTTP_MODULES $HTTP_LIMIT_CONN_MODULE" + HTTP_SRCS="$HTTP_SRCS $HTTP_LIMIT_CONN_SRCS" fi if [ $HTTP_LIMIT_REQ = YES ]; then diff --git a/auto/options b/auto/options index a79f311d3..e8de4ff45 100644 --- a/auto/options +++ b/auto/options @@ -85,7 +85,7 @@ HTTP_UWSGI=YES HTTP_SCGI=YES HTTP_PERL=NO HTTP_MEMCACHED=YES -HTTP_LIMIT_ZONE=YES +HTTP_LIMIT_CONN=YES HTTP_LIMIT_REQ=YES HTTP_EMPTY_GIF=YES HTTP_BROWSER=YES @@ -143,6 +143,8 @@ NGX_LIBATOMIC=NO NGX_CPU_CACHE_LINE= +NGX_POST_CONF_MSG= + opt= for option @@ -227,7 +229,13 @@ do --without-http_uwsgi_module) HTTP_UWSGI=NO ;; --without-http_scgi_module) HTTP_SCGI=NO ;; --without-http_memcached_module) HTTP_MEMCACHED=NO ;; - --without-http_limit_zone_module) HTTP_LIMIT_ZONE=NO ;; + --without-http_limit_zone_module) + HTTP_LIMIT_CONN=NO + NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG +$0: warning: the \"--without-http_limit_zone_module\" option is deprecated, \ +use the \"--without-http_limit_conn_module\" option instead" + ;; + --without-http_limit_conn_module) HTTP_LIMIT_CONN=NO ;; --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 ;; @@ -364,7 +372,7 @@ cat << END --without-http_uwsgi_module disable ngx_http_uwsgi_module --without-http_scgi_module disable ngx_http_scgi_module --without-http_memcached_module disable ngx_http_memcached_module - --without-http_limit_zone_module disable ngx_http_limit_zone_module + --without-http_limit_conn_module disable ngx_http_limit_conn_module --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 diff --git a/auto/sources b/auto/sources index 6c973f66b..24fa3b89f 100644 --- a/auto/sources +++ b/auto/sources @@ -435,8 +435,8 @@ HTTP_MEMCACHED_MODULE=ngx_http_memcached_module HTTP_MEMCACHED_SRCS=src/http/modules/ngx_http_memcached_module.c -HTTP_LIMIT_ZONE_MODULE=ngx_http_limit_zone_module -HTTP_LIMIT_ZONE_SRCS=src/http/modules/ngx_http_limit_zone_module.c +HTTP_LIMIT_CONN_MODULE=ngx_http_limit_conn_module +HTTP_LIMIT_CONN_SRCS=src/http/modules/ngx_http_limit_conn_module.c HTTP_LIMIT_REQ_MODULE=ngx_http_limit_req_module diff --git a/auto/summary b/auto/summary index 010a5be49..c65946c31 100644 --- a/auto/summary +++ b/auto/summary @@ -111,3 +111,5 @@ fi if [ $HTTP_SCGI = YES ]; then echo " nginx http scgi temporary files: \"$NGX_HTTP_SCGI_TEMP_PATH\"" fi + +echo "$NGX_POST_CONF_MSG" |