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/lib/md5/conf b/auto/lib/md5/conf
index 1ca6b43..799d075 100644
--- a/auto/lib/md5/conf
+++ b/auto/lib/md5/conf
@@ -44,7 +44,7 @@
else
- if [ $NGX_PLATFORM != win32 ]; then
+ if [ "$NGX_PLATFORM" != win32 ]; then
MD5=NO
# Solaris 8/9
diff --git a/auto/lib/md5/make b/auto/lib/md5/make
index b333d4d..8bdca0b 100644
--- a/auto/lib/md5/make
+++ b/auto/lib/md5/make
@@ -25,7 +25,7 @@
done=NO
-case $NGX_PLATFORM in
+case "$NGX_PLATFORM" in
win32)
cp auto/lib/md5/$ngx_makefile $MD5
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
index 6792e7f..e0da92a 100644
--- a/auto/lib/openssl/conf
+++ b/auto/lib/openssl/conf
@@ -24,7 +24,7 @@
else
- if [ $NGX_PLATFORM != win32 ]; then
+ if [ "$NGX_PLATFORM" != win32 ]; then
OPENSSL=NO
ngx_feature="OpenSSL library"
diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make
index 4007614..c1aec88 100644
--- a/auto/lib/openssl/make
+++ b/auto/lib/openssl/make
@@ -2,7 +2,7 @@
# Copyright (C) Igor Sysoev
-case $NGX_PLATFORM in
+case "$NGX_PLATFORM" in
*)
echo "$OPENSSL/libssl.a:" >> $MAKEFILE
echo " cd $OPENSSL \\" >> $MAKEFILE
diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf
index 168acba..6516327 100644
--- a/auto/lib/pcre/conf
+++ b/auto/lib/pcre/conf
@@ -42,7 +42,7 @@
else
- if [ $NGX_PLATFORM != win32 ]; then
+ if [ "$NGX_PLATFORM" != win32 ]; then
PCRE=NO
# FreeBSD PCRE port requires --with-cc-opt="-I /usr/local/include"
diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make
index 27d774b..6b52357 100644
--- a/auto/lib/pcre/make
+++ b/auto/lib/pcre/make
@@ -22,7 +22,7 @@
esac
-case $NGX_PLATFORM in
+case "$NGX_PLATFORM" in
win32)
cp auto/lib/pcre/patch.pcre.in $PCRE
diff --git a/auto/lib/zlib/conf b/auto/lib/zlib/conf
index 8edd3f3..3123c66 100644
--- a/auto/lib/zlib/conf
+++ b/auto/lib/zlib/conf
@@ -21,6 +21,7 @@
CORE_LIBS="$CORE_LIBS $ZLIB/deflate.o"
CORE_LIBS="$CORE_LIBS $ZLIB/trees.o"
CORE_LIBS="$CORE_LIBS $ZLIB/zutil.o"
+ CORE_LIBS="$CORE_LIBS $ZLIB/compress.o"
if [ $ZLIB_ASM != NO ]; then
CORE_LIBS="$CORE_LIBS $ZLIB/match.o"
@@ -37,7 +38,7 @@
else
- if [ $NGX_PLATFORM != win32 ]; then
+ if [ "$NGX_PLATFORM" != win32 ]; then
ZLIB=NO
# FreeBSD, Solaris, Linux
diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make
index 8c1abdc..1859a34 100644
--- a/auto/lib/zlib/make
+++ b/auto/lib/zlib/make
@@ -26,7 +26,7 @@
done=NO
-case $NGX_PLATFORM in
+case "$NGX_PLATFORM" in
win32)
cp auto/lib/zlib/$ngx_makefile $ZLIB
diff --git a/auto/lib/zlib/makefile.bcc b/auto/lib/zlib/makefile.bcc
index 95e8800..2c76424 100644
--- a/auto/lib/zlib/makefile.bcc
+++ b/auto/lib/zlib/makefile.bcc
@@ -5,7 +5,8 @@
CFLAGS = -q -O2 -tWM $(CPU_OPT)
zlib.lib:
- bcc32 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c
+ bcc32 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c \
+ compress.c
tlib zlib.lib +adler32.obj +crc32.obj +deflate.obj \
- +trees.obj +zutil.obj
+ +trees.obj +zutil.obj +compress.obj
diff --git a/auto/lib/zlib/makefile.msvc b/auto/lib/zlib/makefile.msvc
index 304b986..a4ee89a 100644
--- a/auto/lib/zlib/makefile.msvc
+++ b/auto/lib/zlib/makefile.msvc
@@ -5,7 +5,7 @@
CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT)
zlib.lib:
- cl -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c
+ cl -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c compress.c
link -lib -out:zlib.lib adler32.obj crc32.obj deflate.obj \
- trees.obj zutil.obj
+ trees.obj zutil.obj compress.obj
diff --git a/auto/lib/zlib/makefile.owc b/auto/lib/zlib/makefile.owc
index 71ba512..dac4365 100644
--- a/auto/lib/zlib/makefile.owc
+++ b/auto/lib/zlib/makefile.owc
@@ -5,5 +5,5 @@
CFLAGS = -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT)
zlib.lib:
- wcl386 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c
- wlib -n zlib.lib adler32.obj crc32.obj deflate.obj trees.obj zutil.obj
+ wcl386 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c compress.c
+ wlib -n zlib.lib adler32.obj crc32.obj deflate.obj trees.obj zutil.obj compress.obj
