nginx-0.1.21-RELEASE import
*) Bugfix: the ngx_http_stub_status_module showed incorrect statistics
if "rtsig" method was used or if several worker process ran on SMP.
*) Bugfix: nginx could not be built by the icc compiler on Linux or if
the zlib-1.2.x library was building from sources.
*) Bugfix: nginx could not be built on NetBSD 2.0.
diff --git a/auto/cc/icc b/auto/cc/icc
index 2195c10..47b91d7 100644
--- a/auto/cc/icc
+++ b/auto/cc/icc
@@ -2,7 +2,7 @@
# Copyright (C) Igor Sysoev
-# Intel C++ compiler 7.1, 8.0
+# Intel C++ compiler 7.1, 8.0, 8.1
# optimizations
@@ -57,7 +57,7 @@
CFLAGS="$CFLAGS -w1"
#CFLAGS="$CFLAGS -w2"
-# disable the ICC 8.0 errors:
+# disable the ICC 8.1 errors:
# error #181: argument is incompatible with corresponding format
# string conversion
# error #269: invalid format string conversion
diff --git a/auto/cc/name b/auto/cc/name
index cbed6a7..fb4f49a 100644
--- a/auto/cc/name
+++ b/auto/cc/name
@@ -29,7 +29,7 @@
echo " using Borland C++ compiler"
else
-if `$CC -v 2>&1 | grep '^gcc version' 2>&1 >/dev/null`; then
+if `$CC -v 2>&1 | grep 'gcc version' 2>&1 >/dev/null`; then
NGX_CC_NAME=gcc
echo " using GNU C compiler"
