nginx-0.1.18-RELEASE import
*) Workaround: the default values of the devpoll_events and the
devpoll_changes directives changed from 512 to 32 to be compatible
with Solaris 10.
*) Bugfix: the proxy_set_x_var and fastcgi_set_var directives were not
inherited.
*) Bugfix: in the redirect rewrite directive the arguments were
concatenated with URI by the "&" rather than the "?".
*) Bugfix: the lines without trailing ";" in the file being included by
the ngx_http_geo_module were silently ignored.
*) Feature: the ngx_http_stub_status_module.
*) Bugfix: the unknown log format in the access_log directive caused
the segmentation fault.
*) Feature: the new "document_root" parameter of the fastcgi_params
directive.
*) Feature: the fastcgi_redirect_errors directive.
*) Feature: the new "break" modifier of the "rewrite" directive allows
to stop the rewrite/location cycle and sets the current
configuration to the request.
diff --git a/auto/cc/conf b/auto/cc/conf
index 0a5db9e..f064bca 100644
--- a/auto/cc/conf
+++ b/auto/cc/conf
@@ -2,6 +2,8 @@
# Copyright (C) Igor Sysoev
+LINK="\$(CC)"
+
ngx_include_opt="-I "
ngx_compile_opt="-c"
ngx_objout="-o "
@@ -56,7 +58,7 @@
# # Compaq C V6.5-207
#
# . auto/cc/ccc
- ngx_include_opt="-I "
+ ngx_include_opt="-I"
;;
# acc)
diff --git a/auto/cc/gcc b/auto/cc/gcc
index 24b908d..d6647e5 100644
--- a/auto/cc/gcc
+++ b/auto/cc/gcc
@@ -27,8 +27,13 @@
# optimizations
-#CFLAGS="$CFLAGS -O2 -fomit-frame-pointer"
-#CFLAGS="$CFLAGS -Os -fomit-frame-pointer"
+#NGX_GCC_OPT="-O2"
+#NGX_GCC_OPT="-Os"
+NGX_GCC_OPT="-O"
+
+CFLAGS="$CFLAGS $NGX_GCC_OPT"
+
+#CFLAGS="$CFLAGS -fomit-frame-pointer"
case $CPU in
pentium)
@@ -83,7 +88,9 @@
# warnings
-CFLAGS="$CFLAGS -O -W"
+# -W requires at least -O
+CFLAGS="$CFLAGS ${NGX_GCC_OPT:-O} -W"
+
CFLAGS="$CFLAGS -Wall -Wpointer-arith"
#CFLAGS="$CFLAGS -Wconversion"
#CFLAGS="$CFLAGS -Winline"
@@ -103,5 +110,3 @@
if [ ".$CPP" = "." ]; then
CPP="$CC -E"
fi
-
-LINK="\$(CC)"
diff --git a/auto/cc/icc b/auto/cc/icc
index b036cb6..2195c10 100644
--- a/auto/cc/icc
+++ b/auto/cc/icc
@@ -68,5 +68,3 @@
# debug
CFLAGS="$CFLAGS -g"
-
-LINK="\$(CC)"
diff --git a/auto/cc/owc b/auto/cc/owc
index 88ffdb1..06e5cc0 100644
--- a/auto/cc/owc
+++ b/auto/cc/owc
@@ -69,8 +69,6 @@
NGX_USE_PCH="-fh=$NGX_OBJS/ngx_config.pch"
-LINK="\$(CC)"
-
# the link flags, built target is NT GUI mode application
CORE_LINK="$CORE_LINK -l=nt_win"
diff --git a/auto/modules b/auto/modules
index 375b755..2c001e2 100644
--- a/auto/modules
+++ b/auto/modules
@@ -156,6 +156,12 @@
#HTTP_SRCS="$HTTP_SRCS $HTPP_CACHE_SRCS"
#HTTP_SRCS="$HTTP_SRCS $HTPP_FILE_CACHE_SRCS"
+if [ $HTTP_STUB_STATUS = YES ]; then
+ have=NGX_STAT_STUB . auto/have
+ HTTP_MODULES="$HTTP_MODULES ngx_http_stub_status_module"
+ HTTP_SRCS="$HTTP_SRCS src/http/modules/ngx_http_stub_status_module.c"
+fi
+
if [ -r $NGX_OBJS/auto ]; then
. $NGX_OBJS/auto
fi
diff --git a/auto/options b/auto/options
index 9aff6e2..7bb93ac 100644
--- a/auto/options
+++ b/auto/options
@@ -58,6 +58,9 @@
HTTP_PROXY=YES
HTTP_FASTCGI=YES
+# STUB
+HTTP_STUB_STATUS=NO
+
IMAP=NO
NGX_MODULES=
@@ -131,6 +134,9 @@
--without-http_proxy_module) HTTP_PROXY=NO ;;
--without-http_fastcgi_module) HTTP_FASTCGI=NO ;;
+ # STUB
+ --with-http_stub_status_module) HTTP_STUB_STATUS=YES ;;
+
--with-imap) IMAP=YES ;;
--with-module=*) NGX_MODULES="$NGX_MODULES $values" ;;
