summaryrefslogtreecommitdiff
path: root/auto/options
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2011-11-14 15:42:44 +0000
committerJonathan Kolb <jon@b0g.us>2011-11-14 15:42:44 +0000
commitfe0ffd542b079021418c77ba3281df919ed1bf71 (patch)
tree7e8222ce923ee4353714a2018c27b1fc72bb42cb /auto/options
parent156a15693d0135dc47addb295c1519cf9d29abf9 (diff)
downloadnginx-fe0ffd542b079021418c77ba3281df919ed1bf71.tar.gz
Changes with nginx 1.1.8 14 Nov 2011v1.1.8
*) Change: the ngx_http_limit_zone_module was renamed to the ngx_http_limit_conn_module. *) Change: the "limit_zone" directive was superseded by the "limit_conn_zone" directive with a new syntax. *) Feature: support for multiple "limit_conn" limits on the same level. *) Feature: the "image_filter_sharpen" directive. *) Bugfix: a segmentation fault might occur in a worker process if resolver got a big DNS response. Thanks to Ben Hawkes. *) Bugfix: in cache key calculation if internal MD5 implementation was used; the bug had appeared in 1.0.4. *) Bugfix: the "If-Modified-Since", "If-Range", etc. client request header lines might be passed to backend while caching; or not passed without caching if caching was enabled in another part of the configuration. *) Bugfix: the module ngx_http_mp4_module sent incorrect "Content-Length" response header line if the "start" argument was used. Thanks to Piotr Sikora.
Diffstat (limited to 'auto/options')
-rw-r--r--auto/options14
1 files changed, 11 insertions, 3 deletions
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