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.
This commit is contained in:
Igor Sysoev
2005-02-22 14:40:13 +00:00
parent 174db74f23
commit d039a2e193
54 changed files with 696 additions and 305 deletions

View File

@@ -21,6 +21,7 @@ if [ $ZLIB != NONE ]; then
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 @@ if [ $ZLIB != NONE ]; then
else
if [ $NGX_PLATFORM != win32 ]; then
if [ "$NGX_PLATFORM" != win32 ]; then
ZLIB=NO
# FreeBSD, Solaris, Linux

View File

@@ -26,7 +26,7 @@ esac
done=NO
case $NGX_PLATFORM in
case "$NGX_PLATFORM" in
win32)
cp auto/lib/zlib/$ngx_makefile $ZLIB

View File

@@ -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

View File

@@ -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

View File

@@ -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