mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-08 02:02:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

nginx-0.0.3-2004-03-29-21:43:58 import

Browse Source
This commit is contained in:
Igor Sysoev 2004-03-29 17:43:58 +00:00
parent 14f02ed0dd
commit 11dbe97ca4
32 changed files with 451 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
auto/cc
View File

@ -62,6 +62,9 @@ case $CC in
# debug # debug
CFLAGS="$CFLAGS -g" CFLAGS="$CFLAGS -g"
# DragonFly's gcc3 generate DWARF
CFLAGS="$CFLAGS -g -gstabs"
have=HAVE_GCC_VARIADIC_MACROS . auto/have have=HAVE_GCC_VARIADIC_MACROS . auto/have
if [ ".$CPP" = "." ]; then if [ ".$CPP" = "." ]; then
@ -70,10 +73,11 @@ case $CC in
LINK="\$(CC)" LINK="\$(CC)"
OBJEXT=o INCOPT="-I "
COMPILEONLY="-c" COMPOPT="-c"
OBJOUT="-o " OBJOUT="-o "
BINOUT="-o " BINOUT="-o "
OBJEXT="o"
CC_STRONG="$CC -Wall -Werror" CC_STRONG="$CC -Wall -Werror"
;; ;;
@ -142,10 +146,11 @@ case $CC in
LINK="\$(CC)" LINK="\$(CC)"
OBJEXT=o INCOPT="-I "
COMPILEONLY="-c" COMPOPT="-c"
OBJOUT="-o " OBJOUT="-o "
BINOUT="-o " BINOUT="-o "
OBJEXT="o"
CC_STRONG="$CC -w1 -Werror" CC_STRONG="$CC -w1 -Werror"
;; ;;
@ -170,7 +175,7 @@ case $CC in
CFLAGS="$CFLAGS -Gs" CFLAGS="$CFLAGS -Gs"
case $CPU in case $CPU in
pentiumpro) pentium)
# optimize for Pentium and Athlon # optimize for Pentium and Athlon
CPU_OPT="-G5" CPU_OPT="-G5"
;; ;;
@ -220,13 +225,13 @@ case $CC in
BUILDPCH="-Ycngx_config.h" BUILDPCH="-Ycngx_config.h"
USEPCH="-Yungx_config.h" USEPCH="-Yungx_config.h"
OBJEXT=obj INCOPT="-I "
COMPILEONLY="-c" COMPOPT="-c"
OBJOUT="-Fo" OBJOUT="-Fo"
BINOUT="-Fe" BINOUT="-Fe"
BINEXT=.exe OBJEXT="obj"
BINEXT=".exe"
CC_STRONG="$CC -W3 -WX" #DIRSEP='\\'
;; ;;
@ -296,15 +301,64 @@ case $CC in
# link flags # link flags
CORE_LINK="$CORE_LINK -l=nt" CORE_LINK="$CORE_LINK -l=nt"
OBJEXT=obj INCOPT="-i="
COMPILEONLY="-c" COMPOPT="-c"
OBJOUT="-fo" OBJOUT="-fo"
BINOUT="-fe=" BINOUT="-fe="
BINEXT=.exe OBJEXT="obj"
BINEXT=".exe"
DIRSEP='\\'
INC_EQ=YES
MAKE_BS=YES
MAKE_SL=YES MAKE_SL=YES
;; ;;
bcc32)
# Borland C++ 5.5
# optimization
# maximize speed
CFLAGS="$CFLAGS -O2"
case $CPU in
pentium)
# optimize for Pentium and Athlon
CPU_OPT="-5"
;;
pentiumpro)
# optimize for Pentium Pro, Pentium II and Pentium III
CPU_OPT="-6"
;;
esac
CFLAGS="$CFLAGS $CPU_OPT"
# multithreaded
CFLAGS="$CFLAGS -tWM"
# stop on warning
CFLAGS="$CFLAGS -w!"
# disable logo
CFLAGS="$CFLAGS -q"
# precompiled headers
CORE_DEPS="$CORE_DEPS $OBJS\\ngx_config.csm"
PCH="$OBJS\\ngx_config.csm"
BUILDPCH="-H=$OBJS\\ngx_config.csm"
USEPCH="-Hu -H=$OBJS\\ngx_config.csm"
LINK="\$(CC)"
INCOPT="-I"
COMPOPT="-c"
OBJOUT="-o"
BINOUT="-e"
OBJEXT="obj"
BINEXT=".exe"
DIRSEP='\\'
;;
esac esac

5
auto/init
View File

@ -12,11 +12,10 @@ CC_WARN=$CC
PCH=NO PCH=NO
USEPCH= USEPCH=
OBJEXT=
BINEXT= BINEXT=
INC_EQ=NO DIRSEP='\/'
MAKE_BS=NO
MAKE_SL=NO MAKE_SL=NO
MAKE_BL=YES
# checking echo's "-n" option and "\c" capabilties # checking echo's "-n" option and "\c" capabilties

6
auto/lib/make
View File

@ -1,12 +1,12 @@
if [ $PCRE != NO ]; then if [ $PCRE != NONE -a $PCRE != NO ]; then
. auto/lib/pcre/make . auto/lib/pcre/make
fi fi
if [ $MD5 != NO ]; then if [ $MD5 != NONE -a $MD5 != NO ]; then
. auto/lib/md5/make . auto/lib/md5/make
fi fi
if [ $ZLIB != NO ]; then if [ $ZLIB != NONE -a $ZLIB != NO ]; then
. auto/lib/zlib/make . auto/lib/zlib/make
fi fi

10
auto/lib/md5/conf
View File

@ -10,17 +10,11 @@ if [ $MD5 != NONE ]; then
OPENSSL_MD5=NO OPENSSL_MD5=NO
fi fi
CORE_INCS="$CORE_INCS -I $MD5" CORE_INCS="$CORE_INCS $MD5"
case "$CC" in case "$CC" in
cl) cl | wcl386 | bcc32)
LINK_DEPS="$LINK_DEPS $MD5/md5.lib"
CORE_LIBS="$CORE_LIBS md5.lib"
CORE_LINK="$CORE_LINK -libpath:$MD5"
;;
wcl386)
LINK_DEPS="$LINK_DEPS $MD5/md5.lib" LINK_DEPS="$LINK_DEPS $MD5/md5.lib"
CORE_LIBS="$CORE_LIBS $MD5/md5.lib" CORE_LIBS="$CORE_LIBS $MD5/md5.lib"
;; ;;

16
auto/lib/md5/make
View File

@ -3,10 +3,17 @@ case "$CC" in
cl) cl)
makefile=makefile.msvc makefile=makefile.msvc
opt="CPU_OPT=$CPU_OPT LIBC=$LIBC MD5_ASM=$MD5_ASM"
;; ;;
wcl386) wcl386)
makefile=makefile.owc makefile=makefile.owc
opt="CPU_OPT=$CPU_OPT"
;;
bcc32)
makefile=makefile.bcc
opt="-DCPU_OPT=$CPU_OPT -DMD5_ASM=$MD5_ASM"
;; ;;
esac esac
@ -15,7 +22,8 @@ esac
case $PLATFORM in case $PLATFORM in
win32) win32)
echo "$MD5/md5.lib:" >> $MAKEFILE line=`echo $MD5/md5.lib: | sed -e "s/\//$DIRSEP/g"`
echo "$line" >> $MAKEFILE
;; ;;
*) *)
@ -31,11 +39,11 @@ done=NO
case $PLATFORM in case $PLATFORM in
win32) win32)
md5=`echo $MD5 | sed -e "s/\//$DIRSEP/g"`
cp auto/lib/md5/$makefile $MD5 cp auto/lib/md5/$makefile $MD5
echo " cd $MD5" >> $MAKEFILE echo " cd $md5" >> $MAKEFILE
echo $ngx_n " \$(MAKE) -f $makefile" $ngx_c >> $MAKEFILE echo " \$(MAKE) -f $makefile $opt" >> $MAKEFILE
echo " CPU_OPT=$CPU_OPT LIBC=$LIBC MD5_ASM=$MD5_ASM" >> $MAKEFILE
echo " cd ..\\..\\.." >> $MAKEFILE echo " cd ..\\..\\.." >> $MAKEFILE
done=YES done=YES

16
auto/lib/md5/makefile.bcc Normal file
View File

@ -0,0 +1,16 @@
CFLAGS = -q -O2 -tWM $(CPU_OPT) -DL_ENDIAN
!if "$(MD5_ASM)" == "YES"
md5.lib:
bcc32 -c $(CFLAGS) -DMD5_ASM md5_dgst.c
tlib md5.lib +md5_dgst.obj +asm/m-win32.obj
!else
md5.lib:
bcc32 -c $(CFLAGS) md5_dgst.c
tlib md5.lib +md5_dgst.obj
!endif

6
auto/lib/md5/makefile.msvc
View File

@ -1,16 +1,16 @@
CFLAGS = -nologo -c -MT -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN CFLAGS = -nologo -MT -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN
!if "$(MD5_ASM)" == "YES" !if "$(MD5_ASM)" == "YES"
md5.lib: md5.lib:
cl $(CFLAGS) -D MD5_ASM md5_dgst.c cl -c $(CFLAGS) -D MD5_ASM md5_dgst.c
link -lib -out:md5.lib md5_dgst.obj asm/m-win32.obj link -lib -out:md5.lib md5_dgst.obj asm/m-win32.obj
!else !else
md5.lib: md5.lib:
cl $(CFLAGS) md5_dgst.c cl -c $(CFLAGS) md5_dgst.c
link -lib -out:md5.lib md5_dgst.obj link -lib -out:md5.lib md5_dgst.obj
!endif !endif

4
auto/lib/md5/makefile.owc
View File

@ -1,6 +1,6 @@
CFLAGS = -c -zq -bt=nt -bm -ot -op -oi -oe -s $(CPU_OPT) CFLAGS = -zq -bt=nt -bm -ot -op -oi -oe -s $(CPU_OPT)
md5.lib: md5.lib:
wcl386 $(CFLAGS) -dL_ENDIAN md5_dgst.c wcl386 -c $(CFLAGS) -dL_ENDIAN md5_dgst.c
wlib -n md5.lib md5_dgst.obj wlib -n md5.lib md5_dgst.obj

13
auto/lib/pcre/conf
View File

@ -1,21 +1,12 @@
if [ $PCRE != NONE ]; then if [ $PCRE != NONE ]; then
CORE_INCS="$CORE_INCS -I $PCRE" CORE_INCS="$CORE_INCS $PCRE"
CORE_DEPS="$CORE_DEPS $REGEX_DEPS" CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
CORE_SRCS="$CORE_SRCS $REGEX_SRCS" CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
case "$CC" in case "$CC" in
cl) cl | wcl386 | bcc32)
have=HAVE_PCRE . auto/have
have=PCRE_STATIC . auto/have
CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
LINK_DEPS="$LINK_DEPS $PCRE/pcre.lib"
CORE_LIBS="$CORE_LIBS pcre.lib"
CORE_LINK="$CORE_LINK -libpath:$PCRE"
;;
wcl386)
have=HAVE_PCRE . auto/have have=HAVE_PCRE . auto/have
have=PCRE_STATIC . auto/have have=PCRE_STATIC . auto/have
CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"

24
auto/lib/pcre/make
View File

@ -3,10 +3,17 @@ case "$CC" in
cl) cl)
makefile=makefile.msvc makefile=makefile.msvc
opt="CPU_OPT=$CPU_OPT LIBC=$LIBC"
;; ;;
wcl386) wcl386)
makefile=makefile.owc makefile=makefile.owc
opt="CPU_OPT=$CPU_OPT"
;;
bcc32)
makefile=makefile.bcc
opt="-DCPU_OPT=$CPU_OPT"
;; ;;
esac esac
@ -19,14 +26,21 @@ case $PLATFORM in
cp auto/lib/pcre/patch.config.in $PCRE cp auto/lib/pcre/patch.config.in $PCRE
cp auto/lib/pcre/$makefile $PCRE cp auto/lib/pcre/$makefile $PCRE
echo "$PCRE/pcre.h:" >> $MAKEFILE pcre=`echo $PCRE | sed -e "s/\//$DIRSEP/g"`
echo " cd $PCRE" >> $MAKEFILE line=`echo $PCRE/pcre.h: | sed -e "s/\//$DIRSEP/g"`
echo "$line" >> $MAKEFILE
echo " cd $pcre" >> $MAKEFILE
echo " \$(MAKE) -f $makefile pcre.h" >> $MAKEFILE echo " \$(MAKE) -f $makefile pcre.h" >> $MAKEFILE
echo " cd ..\\..\\.." >> $MAKEFILE echo " cd ..\\..\\.." >> $MAKEFILE
echo >> $MAKEFILE echo >> $MAKEFILE
echo "$PCRE/pcre.lib: $PCRE/pcre.h" >> $MAKEFILE
echo " cd $PCRE" >> $MAKEFILE line="$PCRE/pcre.lib: $PCRE/pcre.h"
echo " \$(MAKE) -f $makefile CPU_OPT=$CPU_OPT LIBC=$LIBC">> $MAKEFILE line=`echo $line | sed -e "s/\//$DIRSEP/g"`
echo "$line" >> $MAKEFILE
echo " cd $pcre" >> $MAKEFILE
echo " \$(MAKE) -f $makefile $opt" >> $MAKEFILE
echo " cd ..\\..\\.." >> $MAKEFILE echo " cd ..\\..\\.." >> $MAKEFILE
;; ;;

17
auto/lib/pcre/makefile.bcc Normal file
View File

@ -0,0 +1,17 @@
CFLAGS = -q -O2 -tWM $(CPU_OPT)
PCREFLAGS = -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10
pcre.lib: pcre.h
bcc32 -q -edftables dftables.c
dftables > chartables.c
bcc32 -c $(CFLAGS) $(PCREFLAGS) maketables.c get.c study.c pcre.c
tlib pcre.lib +maketables.obj +get.obj +study.obj +pcre.obj
pcre.h:
patch -o pcre.h pcre.in patch.pcre.in
patch -o config.h config.in patch.config.in

10
auto/lib/zlib/conf
View File

@ -1,16 +1,10 @@
if [ $ZLIB != NONE ]; then if [ $ZLIB != NONE ]; then
CORE_INCS="$CORE_INCS -I $ZLIB" CORE_INCS="$CORE_INCS $ZLIB"
case "$CC" in case "$CC" in
cl) cl | wcl386 | bcc32)
LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib"
CORE_LIBS="$CORE_LIBS zlib.lib"
CORE_LINK="$CORE_LINK -libpath:$ZLIB"
;;
wcl386)
LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib" LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib"
CORE_LIBS="$CORE_LIBS $ZLIB/zlib.lib" CORE_LIBS="$CORE_LIBS $ZLIB/zlib.lib"
;; ;;

16
auto/lib/zlib/make
View File

@ -3,10 +3,18 @@ case "$CC" in
cl) cl)
makefile=makefile.msvc makefile=makefile.msvc
opt="CPU_OPT=$CPU_OPT LIBC=$LIBC"
;; ;;
wcl386) wcl386)
makefile=makefile.owc makefile=makefile.owc
opt="CPU_OPT=$CPU_OPT"
;;
bcc32)
makefile=makefile.bcc
opt="-DCPU_OPT=$CPU_OPT"
;; ;;
esac esac
@ -15,7 +23,8 @@ esac
case $PLATFORM in case $PLATFORM in
win32) win32)
echo "$ZLIB/zlib.lib:" >> $MAKEFILE line=`echo $ZLIB/zlib.lib: | sed -e "s/\//$DIRSEP/g"`
echo "$line" >> $MAKEFILE
;; ;;
*) *)
@ -31,10 +40,11 @@ done=NO
case $PLATFORM in case $PLATFORM in
win32) win32)
zlib=`echo $ZLIB | sed -e "s/\//$DIRSEP/g"`
cp auto/lib/zlib/$makefile $ZLIB cp auto/lib/zlib/$makefile $ZLIB
echo " cd $ZLIB" >> $MAKEFILE echo " cd $zlib" >> $MAKEFILE
echo " \$(MAKE) -f $makefile CPU_OPT=$CPU_OPT LIBC=$LIBC">> $MAKEFILE echo " \$(MAKE) -f $makefile $opt" >> $MAKEFILE
echo " cd ..\\..\\.." >> $MAKEFILE echo " cd ..\\..\\.." >> $MAKEFILE
done=YES done=YES

8
auto/lib/zlib/makefile.bcc Normal file
View File

@ -0,0 +1,8 @@
CFLAGS = -q -O2 -tWM $(CPU_OPT)
zlib.lib:
bcc32 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c
tlib zlib.lib +adler32.obj +crc32.obj +deflate.obj \
+trees.obj +zutil.obj

4
auto/lib/zlib/makefile.msvc
View File

@ -1,8 +1,8 @@
CFLAGS = -nologo -c -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT)
zlib.lib: zlib.lib:
cl $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c cl -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c
link -lib -out:zlib.lib adler32.obj crc32.obj deflate.obj \ link -lib -out:zlib.lib adler32.obj crc32.obj deflate.obj \
trees.obj zutil.obj trees.obj zutil.obj

4
auto/lib/zlib/makefile.owc
View File

@ -1,6 +1,6 @@
CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT) CFLAGS = -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT)
zlib.lib: zlib.lib:
wcl386 $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c 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 wlib -n zlib.lib adler32.obj crc32.obj deflate.obj trees.obj zutil.obj

109
auto/make
View File

@ -18,14 +18,9 @@ if [ $MAKE_SL = YES ]; then
echo >> $MAKEFILE echo >> $MAKEFILE
fi fi
all_inc="$CORE_INCS -I $OBJS $HTTP_INCS" all_inc="$CORE_INCS $OBJS $HTTP_INCS"
if [ $INC_EQ = YES ]; then all_inc=`echo " $all_inc" | sed -e "s/ \([^ ]\)/ $INCOPT\1/g"`
all_inc=`echo $all_inc | sed -e "s/-I /-i=/g"` all_inc=`echo $all_inc | sed -e "s/\//$DIRSEP/g"`
fi
if [ $MAKE_BS = YES ]; then
all_inc=`echo $all_inc | sed -e "s/\//\\\\\\/g"`
fi
echo "ALL_INCS = $all_inc" >> $MAKEFILE echo "ALL_INCS = $all_inc" >> $MAKEFILE
echo >> $MAKEFILE echo >> $MAKEFILE
@ -41,9 +36,7 @@ fi
for dep in $CORE_DEPS for dep in $CORE_DEPS
do do
if [ $MAKE_BS = YES ]; then dep=`echo $dep | sed -e "s/\//$DIRSEP/g"`
dep=`echo $dep | sed -e "s/\//\\\\\\/g"`
fi
if [ $MAKE_SL = YES ]; then if [ $MAKE_SL = YES ]; then
echo $ngx_n " $dep" $ngx_c >> $MAKEFILE echo $ngx_n " $dep" $ngx_c >> $MAKEFILE
@ -60,14 +53,8 @@ if [ $MAKE_SL = YES ]; then
echo >> $MAKEFILE echo >> $MAKEFILE
fi fi
inc="$CORE_INCS -I $OBJS" inc="$CORE_INCS $OBJS"
if [ $INC_EQ = YES ]; then inc=`echo " $inc" | sed -e "s/ \([^ ]\)/ $INCOPT\1/g" -e "s/\//$DIRSEP/g"`
inc=`echo $inc | sed -e "s/-I /-i=/g"`
fi
if [ $MAKE_BS = YES ]; then
inc=`echo $inc | sed -e "s/\//\\\\\\/g"`
fi
echo "CORE_INCS = $inc" >> $MAKEFILE echo "CORE_INCS = $inc" >> $MAKEFILE
echo >> $MAKEFILE echo >> $MAKEFILE
@ -83,9 +70,7 @@ fi
for dep in $HTTP_DEPS for dep in $HTTP_DEPS
do do
if [ $MAKE_BS = YES ]; then dep=`echo $dep | sed -e "s/\//$DIRSEP/g"`
dep=`echo $dep | sed -e "s/\//\\\\\\/g"`
fi
if [ $MAKE_SL = YES ]; then if [ $MAKE_SL = YES ]; then
echo $ngx_n " $dep" $ngx_c >> $MAKEFILE echo $ngx_n " $dep" $ngx_c >> $MAKEFILE
@ -102,14 +87,8 @@ if [ $MAKE_SL = YES ]; then
echo >> $MAKEFILE echo >> $MAKEFILE
fi fi
inc="$HTTP_INCS -I $OBJS" inc="$HTTP_INCS $OBJS"
if [ $INC_EQ = YES ]; then inc=`echo " $inc" | sed -e "s/ \([^ ]\)/ $INCOPT\1/g" -e "s/\//$DIRSEP/g"`
inc=`echo $inc | sed -e "s/-I /-i=/g"`
fi
if [ $MAKE_BS = YES ]; then
inc=`echo $inc | sed -e "s/\//\\\\\\/g"`
fi
echo "HTTP_INCS = $inc" >> $MAKEFILE echo "HTTP_INCS = $inc" >> $MAKEFILE
echo >> $MAKEFILE echo >> $MAKEFILE
@ -129,11 +108,7 @@ fi
for src in $CORE_SRCS $HTTP_SRCS for src in $CORE_SRCS $HTTP_SRCS
do do
obj=`echo $src | sed -e "s/\.c\$/.$OBJEXT/" -e "s/\.S\$/.$OBJEXT/"` obj=`echo $src | sed -e "s/\.c\$/.$OBJEXT/" -e "s/\.S\$/.$OBJEXT/"`
obj="$OBJS/$obj" obj=`echo $OBJS/$obj | sed -e "s/\//$DIRSEP/g"`
if [ $MAKE_BS = YES ]; then
obj=`echo $obj | sed -e "s/\//\\\\\\/g"`
fi
if [ $MAKE_SL = YES ]; then if [ $MAKE_SL = YES ]; then
echo $ngx_n " $obj" $ngx_c >> $MAKEFILE echo $ngx_n " $obj" $ngx_c >> $MAKEFILE
@ -145,10 +120,7 @@ done
for src in $NGX_MODULES_C $LINK_DEPS for src in $NGX_MODULES_C $LINK_DEPS
do do
obj=`echo $src | sed -e "s/\.c\$/.$OBJEXT/"` obj=`echo $src | sed -e "s/\.c\$/.$OBJEXT/"`
obj=`echo $obj | sed -e "s/\//$DIRSEP/g"`
if [ $MAKE_BS = YES ]; then
obj=`echo $obj | sed -e "s/\//\\\\\\/g"`
fi
if [ $MAKE_SL = YES ]; then if [ $MAKE_SL = YES ]; then
echo $ngx_n " $obj" $ngx_c >> $MAKEFILE echo $ngx_n " $obj" $ngx_c >> $MAKEFILE
@ -173,11 +145,7 @@ fi
for src in $CORE_SRCS $HTTP_SRCS for src in $CORE_SRCS $HTTP_SRCS
do do
obj=`echo $src | sed -e "s/\.c\$/.$OBJEXT/" -e "s/\.S\$/.$OBJEXT/"` obj=`echo $src | sed -e "s/\.c\$/.$OBJEXT/" -e "s/\.S\$/.$OBJEXT/"`
obj="$OBJS/$obj" obj=`echo $OBJS/$obj | sed -e "s/\//$DIRSEP/g"`
if [ $MAKE_BS = YES ]; then
obj=`echo $obj | sed -e "s/\//\\\\\\/g"`
fi
if [ $MAKE_SL = YES ]; then if [ $MAKE_SL = YES ]; then
echo $ngx_n " $obj" $ngx_c >> $MAKEFILE echo $ngx_n " $obj" $ngx_c >> $MAKEFILE
@ -189,22 +157,18 @@ done
# nginx build ngx_modules.c and libs # nginx build ngx_modules.c and libs
obj=`echo $NGX_MODULES_C | sed -e "s/\.c\$/.$OBJEXT/"` obj=`echo $NGX_MODULES_C | sed -e "s/\.c\$/.$OBJEXT/" -e "s/\//$DIRSEP/g"`
libs=`echo $CORE_LIBS | sed -e "s/\.c\$/.$OBJEXT/"` src=`echo $NGX_MODULES_C | sed -e "s/\//$DIRSEP/g"`
src=$NGX_MODULES_C libs=`echo $CORE_LIBS | sed -e "s/\.c\$/.$OBJEXT/" -e "s/\//$DIRSEP/g"`
if [ $MAKE_BS = YES ]; then link=`echo $CORE_LINK | sed -e "s/\.c\$/.$OBJEXT/" -e "s/\//$DIRSEP/g"`
obj=`echo $obj | sed -e "s/\//\\\\\\/g"`
src=`echo $src | sed -e "s/\//\\\\\\/g"`
libs=`echo $libs | sed -e "s/\//\\\\\\/g"`
fi
if [ $MAKE_SL = YES ]; then if [ $MAKE_SL = YES ]; then
echo " $obj $libs $CORE_LINK" >> $MAKEFILE echo " $obj $libs $CORE_LINK" >> $MAKEFILE
echo >> $MAKEFILE echo >> $MAKEFILE
else else
echo " $obj \\" >> $MAKEFILE echo " $obj \\" >> $MAKEFILE
echo " $CORE_LIBS \\" >> $MAKEFILE echo " $libs \\" >> $MAKEFILE
echo " $CORE_LINK" >> $MAKEFILE echo " $link" >> $MAKEFILE
echo >> $MAKEFILE echo >> $MAKEFILE
fi fi
@ -221,13 +185,13 @@ fi
if [ $MAKE_SL = YES ]; then if [ $MAKE_SL = YES ]; then
echo "$obj: $NGX_MODULES_C $deps" >> $MAKEFILE echo "$obj: $NGX_MODULES_C $deps" >> $MAKEFILE
echo $ngx_n " \$(CC) $COMPILEONLY $args" $ngx_c >> $MAKEFILE echo $ngx_n " \$(CC) $COMPOPT $args" $ngx_c >> $MAKEFILE
echo " $OBJOUT$obj $src" >> $MAKEFILE echo " $OBJOUT$obj $src" >> $MAKEFILE
echo >> $MAKEFILE echo >> $MAKEFILE
else else
echo "$obj: \\" >> $MAKEFILE echo "$obj: \\" >> $MAKEFILE
echo " $NGX_MODULES_C $deps" >> $MAKEFILE echo " $NGX_MODULES_C $deps" >> $MAKEFILE
echo " \$(CC) $COMPILEONLY $args \\" >> $MAKEFILE echo " \$(CC) $COMPOPT $args \\" >> $MAKEFILE
echo " $OBJOUT$obj \\" >> $MAKEFILE echo " $OBJOUT$obj \\" >> $MAKEFILE
echo " $src" >> $MAKEFILE echo " $src" >> $MAKEFILE
echo >> $MAKEFILE echo >> $MAKEFILE
@ -239,21 +203,17 @@ fi
for src in $CORE_SRCS for src in $CORE_SRCS
do do
obj=`echo $src | sed -e "s/\.c\$/.$OBJEXT/" -e "s/\.S\$/.$OBJEXT/"` obj=`echo $src | sed -e "s/\.c\$/.$OBJEXT/" -e "s/\.S\$/.$OBJEXT/"`
obj="$OBJS/$obj" obj=`echo $OBJS/$obj | sed -e "s/\//$DIRSEP/g"`
src=`echo $src | sed -e "s/\//$DIRSEP/g"`
if [ $MAKE_BS = YES ]; then
obj=`echo $obj | sed -e "s/\//\\\\\\/g"`
src=`echo $src | sed -e "s/\//\\\\\\/g"`
fi
if [ $MAKE_SL = YES ]; then if [ $MAKE_SL = YES ]; then
echo "$obj: $src $deps" >> $MAKEFILE echo "$obj: $src $deps" >> $MAKEFILE
echo " \$(CC) $COMPILEONLY $args $OBJOUT$obj $src" >> $MAKEFILE echo " \$(CC) $COMPOPT $args $OBJOUT$obj $src" >> $MAKEFILE
echo >> $MAKEFILE echo >> $MAKEFILE
else else
echo "$obj: \\" >> $MAKEFILE echo "$obj: \\" >> $MAKEFILE
echo " $src $deps" >> $MAKEFILE echo " $src $deps" >> $MAKEFILE
echo " \$(CC) $COMPILEONLY $args \\" >> $MAKEFILE echo " \$(CC) $COMPOPT $args \\" >> $MAKEFILE
echo " $OBJOUT$obj \\" >> $MAKEFILE echo " $OBJOUT$obj \\" >> $MAKEFILE
echo " $src" >> $MAKEFILE echo " $src" >> $MAKEFILE
echo >> $MAKEFILE echo >> $MAKEFILE
@ -274,21 +234,17 @@ fi
for src in $HTTP_SRCS for src in $HTTP_SRCS
do do
obj=`echo $src | sed -e "s/\.c\$/.$OBJEXT/"` obj=`echo $src | sed -e "s/\.c\$/.$OBJEXT/"`
obj="$OBJS/$obj" obj=`echo $OBJS/$obj | sed -e "s/\//$DIRSEP/g"`
src=`echo $src | sed -e "s/\//$DIRSEP/g"`
if [ $MAKE_BS = YES ]; then
obj=`echo $obj | sed -e "s/\//\\\\\\/g"`
src=`echo $src | sed -e "s/\//\\\\\\/g"`
fi
if [ $MAKE_SL = YES ]; then if [ $MAKE_SL = YES ]; then
echo "$obj: $src $deps" >> $MAKEFILE echo "$obj: $src $deps" >> $MAKEFILE
echo " \$(CC) $COMPILEONLY $args $OBJOUT$obj $src" >> $MAKEFILE echo " \$(CC) $COMPOPT $args $OBJOUT$obj $src" >> $MAKEFILE
echo >> $MAKEFILE echo >> $MAKEFILE
else else
echo "$obj: \\" >> $MAKEFILE echo "$obj: \\" >> $MAKEFILE
echo " $src $deps" >> $MAKEFILE echo " $src $deps" >> $MAKEFILE
echo " \$(CC) $COMPILEONLY $args \\" >> $MAKEFILE echo " \$(CC) $COMPOPT $args \\" >> $MAKEFILE
echo " $OBJOUT$obj \\" >> $MAKEFILE echo " $OBJOUT$obj \\" >> $MAKEFILE
echo " $src" >> $MAKEFILE echo " $src" >> $MAKEFILE
echo >> $MAKEFILE echo >> $MAKEFILE
@ -302,13 +258,10 @@ if [ $PCH != NO ]; then
echo "#include <ngx_config.h>" > $OBJS/pch.c echo "#include <ngx_config.h>" > $OBJS/pch.c
pch="$PCH: src/core/ngx_config.h $OS_CONFIG $OBJS/ngx_auto_config.h" pch="$PCH: src/core/ngx_config.h $OS_CONFIG $OBJS/ngx_auto_config.h"
src="\$(CC) \$(CFLAGS) $BUILDPCH $COMPILEONLY \$(ALL_INCS)" pch=`echo $pch | sed -e "s/\//$DIRSEP/g"`
src="\$(CC) \$(CFLAGS) $BUILDPCH $COMPOPT \$(ALL_INCS)"
src="$src $OBJOUT$OBJS/pch.obj $OBJS/pch.c" src="$src $OBJOUT$OBJS/pch.obj $OBJS/pch.c"
src=`echo $src | sed -e "s/\//$DIRSEP/g"`
if [ $MAKE_BS = YES ]; then
pch=`echo $pch | sed -e "s/\//\\\\\\/g"`
src=`echo $src | sed -e "s/\//\\\\\\/g"`
fi
echo "$pch" >> $MAKEFILE echo "$pch" >> $MAKEFILE
echo " $src" >> $MAKEFILE echo " $src" >> $MAKEFILE

12
auto/sources
View File

@ -1,7 +1,7 @@
CORE_MODULES="ngx_core_module ngx_errlog_module" CORE_MODULES="ngx_core_module ngx_errlog_module"
CORE_INCS="-I src/core" CORE_INCS="src/core"
CORE_DEPS="src/core/nginx.h \ CORE_DEPS="src/core/nginx.h \
src/core/ngx_config.h \ src/core/ngx_config.h \
@ -48,7 +48,7 @@ REGEX_SRCS=src/core/ngx_regex.c
EVENT_MODULES="ngx_events_module ngx_event_core_module" EVENT_MODULES="ngx_events_module ngx_event_core_module"
EVENT_INCS="-I src/event -I src/event/modules" EVENT_INCS="src/event src/event/modules"
EVENT_DEPS="src/event/ngx_event.h \ EVENT_DEPS="src/event/ngx_event.h \
src/event/ngx_event_timer.h \ src/event/ngx_event_timer.h \
@ -93,7 +93,7 @@ AIO_SRCS="src/event/modules/ngx_aio_module.c \
src/os/unix/ngx_aio_write_chain.c" src/os/unix/ngx_aio_write_chain.c"
UNIX_INCS="$CORE_INCS $EVENT_INCS -I src/os/unix" UNIX_INCS="$CORE_INCS $EVENT_INCS src/os/unix"
UNIX_DEPS="$CORE_DEPS $EVENT_DEPS \ UNIX_DEPS="$CORE_DEPS $EVENT_DEPS \
src/os/unix/ngx_time.h \ src/os/unix/ngx_time.h \
@ -135,7 +135,7 @@ SOLARIS_SRCS=src/os/unix/ngx_solaris_init.c
SOLARIS_SENDFILEV_SRCS=src/os/unix/ngx_solaris_sendfilev_chain.c SOLARIS_SENDFILEV_SRCS=src/os/unix/ngx_solaris_sendfilev_chain.c
WIN32_INCS="$CORE_INCS $EVENT_INCS -I src/os/win32" WIN32_INCS="$CORE_INCS $EVENT_INCS src/os/win32"
WIN32_DEPS="$CORE_DEPS $EVENT_DEPS \ WIN32_DEPS="$CORE_DEPS $EVENT_DEPS \
src/os/win32/ngx_win32_config.h \ src/os/win32/ngx_win32_config.h \
@ -182,7 +182,7 @@ HTTP_NOT_MODIFIED_FILTER_MODULE=ngx_http_not_modified_filter_module
HTTP_STATIC_MODULE=ngx_http_static_module HTTP_STATIC_MODULE=ngx_http_static_module
HTTP_INDEX_MODULE=ngx_http_index_module HTTP_INDEX_MODULE=ngx_http_index_module
HTTP_INCS="-I src/http -I src/http/modules" HTTP_INCS="src/http src/http/modules"
HTTP_DEPS="src/http/ngx_http.h \ HTTP_DEPS="src/http/ngx_http.h \
src/http/ngx_http_request.h \ src/http/ngx_http_request.h \
@ -232,7 +232,7 @@ HTTP_SSI_SRCS=src/http/modules/ngx_http_ssi_filter.c
HTTP_PROXY_MODULE=ngx_http_proxy_module HTTP_PROXY_MODULE=ngx_http_proxy_module
HTTP_PROXY_INCS="-I src/http/modules/proxy" HTTP_PROXY_INCS="src/http/modules/proxy"
HTTP_PROXY_DEPS=src/http/modules/proxy/ngx_http_proxy_handler.h HTTP_PROXY_DEPS=src/http/modules/proxy/ngx_http_proxy_handler.h
HTTP_PROXY_SRCS="src/http/modules/proxy/ngx_http_proxy_handler.c \ HTTP_PROXY_SRCS="src/http/modules/proxy/ngx_http_proxy_handler.c \
src/http/modules/proxy/ngx_http_proxy_upstream.c \ src/http/modules/proxy/ngx_http_proxy_upstream.c \

2
src/core/ngx_alloc.c
View File

@ -90,8 +90,6 @@ void ngx_destroy_pool(ngx_pool_t *pool)
break; break;
} }
} }
pool = NULL;
} }

12
src/core/ngx_atomic.h
View File

@ -21,13 +21,14 @@ static ngx_inline uint32_t ngx_atomic_inc(ngx_atomic_t *value)
{ {
uint32_t old; uint32_t old;
old = 1;
__asm__ volatile ( __asm__ volatile (
" movl $1, %0; "
NGX_SMP_LOCK NGX_SMP_LOCK
" xaddl %0, %1; " " xaddl %0, %1; "
: "=a" (old) : "m" (*value)); : "=q" (old) : "m" (*value));
return old; return old;
} }
@ -37,13 +38,14 @@ static ngx_inline uint32_t ngx_atomic_dec(ngx_atomic_t *value)
{ {
uint32_t old; uint32_t old;
old = (uint32_t) -1;
__asm__ volatile ( __asm__ volatile (
" movl $-1, %0; "
NGX_SMP_LOCK NGX_SMP_LOCK
" xaddl %0, %1; " " xaddl %0, %1; "
: "=a" (old) : "m" (*value)); : "=q" (old) : "m" (*value));
return old; return old;
} }
@ -62,7 +64,7 @@ static ngx_inline uint32_t ngx_atomic_cmp_set(ngx_atomic_t *lock,
" setz %%al; " " setz %%al; "
" movzbl %%al, %0; " " movzbl %%al, %0; "
: "=a" (res) : "m" (*lock), "a" (old), "q" (set)); : "+a" (res) : "m" (*lock), "a" (old), "q" (set));
return res; return res;
} }

2
src/core/ngx_conf_file.c
View File

@ -556,7 +556,7 @@ void ngx_conf_log_error(ngx_uint_t level, ngx_conf_t *cf, ngx_err_t err,
" (%d: ", err); " (%d: ", err);
len += ngx_strerror_r(err, errstr + len, sizeof(errstr) - len - 1); len += ngx_strerror_r(err, errstr + len, sizeof(errstr) - len - 1);
errstr[len++] = ')'; errstr[len++] = ')';
errstr[len++] = '\0'; errstr[len] = '\0';
} }
ngx_log_error(level, cf->log, 0, "%s in %s:%d", ngx_log_error(level, cf->log, 0, "%s in %s:%d",

12
src/core/ngx_config.h
View File

@ -9,16 +9,22 @@
#endif #endif
#if defined __FreeBSD__ #if defined __DragonFly__ && !defined(__FreeBSD__)
#define __FreeBSD__ 4
#define __FreeBSD_version 480101
#endif
#if defined (__FreeBSD__)
#include <ngx_freebsd_config.h> #include <ngx_freebsd_config.h>
#elif defined __linux__ #elif defined (__linux__)
#include <ngx_linux_config.h> #include <ngx_linux_config.h>
/* Solaris */ /* Solaris */
#elif defined(sun) && (defined(__svr4__) || defined(__SVR4)) #elif defined (sun) && (defined (__svr4__) || defined (__SVR4))
#include <ngx_solaris_config.h> #include <ngx_solaris_config.h>

23
src/core/ngx_times.c
View File

@ -171,7 +171,12 @@ void ngx_gmtime(time_t t, ngx_tm_t *tp)
mon += 2; mon += 2;
if (yday >= 306) { if (yday >= 306) {
yday -= 306; /*
* yday is not used in Win32 SYSTEMTIME
*
* yday -= 306;
*/
year++; year++;
mon -= 12; mon -= 12;
@ -194,12 +199,16 @@ void ngx_gmtime(time_t t, ngx_tm_t *tp)
} }
} }
} else { /*
yday += 31 + 28; * yday is not used in Win32 SYSTEMTIME
*
if ((year % 4 == 0) && (year % 100 || (year % 400 == 0))) { * } else {
yday++; * yday += 31 + 28;
} *
* if ((year % 4 == 0) && (year % 100 || (year % 400 == 0))) {
* yday++;
* }
*/
} }
tp->ngx_tm_sec = (ngx_tm_sec_t) sec; tp->ngx_tm_sec = (ngx_tm_sec_t) sec;

5
src/event/ngx_event_busy_lock.c
View File

@ -12,9 +12,10 @@ static void ngx_event_busy_lock_posted_handler(ngx_event_t *ev);
/* /*
* NGX_OK: the busy lock is held * NGX_OK: the busy lock is held
* NGX_BUSY: there are many the busy locks or many the waiting locks
* NGX_AGAIN: the all busy locks are held but we will wait the specified time * NGX_AGAIN: the all busy locks are held but we will wait the specified time
* NGX_ERROR: there was error while the mutex locking * NGX_BUSY: ctx->timer == 0: there are many the busy locks
* ctx->timer != 0: there are many the waiting locks
* NGX_ERROR: an error occured while the mutex locking
*/ */
ngx_int_t ngx_event_busy_lock(ngx_event_busy_lock_t *bl, ngx_int_t ngx_event_busy_lock(ngx_event_busy_lock_t *bl,

116
src/http/modules/proxy/ngx_http_proxy_upstream.c
View File

@ -46,7 +46,9 @@ static char connection_close_header[] = "Connection: close" CRLF;
int ngx_http_proxy_request_upstream(ngx_http_proxy_ctx_t *p) int ngx_http_proxy_request_upstream(ngx_http_proxy_ctx_t *p)
{ {
int rc; int rc;
ngx_temp_file_t *tf;
ngx_http_request_t *r; ngx_http_request_t *r;
ngx_http_request_body_t *rb;
ngx_http_proxy_upstream_t *u; ngx_http_proxy_upstream_t *u;
r = p->request; r = p->request;
@ -63,29 +65,40 @@ int ngx_http_proxy_request_upstream(ngx_http_proxy_ctx_t *p)
u->method = r->method; u->method = r->method;
if (!(rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t)))) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
r->request_body = rb;
if (r->headers_in.content_length_n > 0) { if (r->headers_in.content_length_n > 0) {
if (!(r->temp_file = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t)))) {
if (!(tf = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t)))) {
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }
r->temp_file->file.fd = NGX_INVALID_FILE; tf->file.fd = NGX_INVALID_FILE;
r->temp_file->file.log = r->connection->log; tf->file.log = r->connection->log;
r->temp_file->path = p->lcf->temp_path; tf->path = p->lcf->temp_path;
r->temp_file->pool = r->pool; tf->pool = r->pool;
r->temp_file->warn = "a client request body is buffered " tf->warn = "a client request body is buffered to a temporary file";
"to a temporary file"; /* tf->persistent = 0; */
/* r->temp_file->persistent = 0; */
r->request_body_handler = ngx_http_proxy_init_upstream; rb->buf_size = p->lcf->request_buffer_size;
r->data = p; rb->handler = ngx_http_proxy_init_upstream;
rb->data = p;
/* rb->bufs = NULL; */
/* rb->buf = NULL; */
/* rb->rest = 0; */
rc = ngx_http_read_client_request_body(r, p->lcf->request_buffer_size); rb->temp_file = tf;
rc = ngx_http_read_client_request_body(r);
if (rc == NGX_AGAIN) { if (rc == NGX_AGAIN) {
return NGX_DONE; return NGX_DONE;
} }
if (rc >= NGX_HTTP_SPECIAL_RESPONSE || rc == NGX_ERROR) { if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
return rc; return rc;
} }
} }
@ -118,7 +131,7 @@ static ngx_chain_t *ngx_http_proxy_create_request(ngx_http_proxy_ctx_t *p)
+ 2; /* 2 is for "\r\n" at the header end */ + 2; /* 2 is for "\r\n" at the header end */
if (p->lcf->preserve_host) { if (p->lcf->preserve_host && r->headers_in.host) {
len += sizeof(host_header) - 1 len += sizeof(host_header) - 1
+ r->headers_in.host_name_len + r->headers_in.host_name_len
+ 1 /* 1 is for ":" */ + 1 /* 1 is for ":" */
@ -339,11 +352,11 @@ static void ngx_http_proxy_init_upstream(void *data)
return; return;
} }
if (r->request_hunks) { if (r->request_body->bufs) {
cl->next = r->request_hunks; cl->next = r->request_body->bufs;
} }
r->request_hunks = cl; r->request_body->bufs = cl;
if (!(ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_proxy_log_ctx_t)))) { if (!(ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_proxy_log_ctx_t)))) {
ngx_http_proxy_finalize_request(p, NGX_HTTP_INTERNAL_SERVER_ERROR); ngx_http_proxy_finalize_request(p, NGX_HTTP_INTERNAL_SERVER_ERROR);
@ -380,7 +393,11 @@ static void ngx_http_proxy_init_upstream(void *data)
output->filter_ctx = writer; output->filter_ctx = writer;
writer->pool = r->pool; writer->pool = r->pool;
#if 0
if (p->lcf->busy_lock && p->busy_lock == NULL) {
#else
if (p->lcf->busy_lock && !p->busy_locked) { if (p->lcf->busy_lock && !p->busy_locked) {
#endif
ngx_http_proxy_upstream_busy_lock(p); ngx_http_proxy_upstream_busy_lock(p);
} else { } else {
ngx_http_proxy_connect(p); ngx_http_proxy_connect(p);
@ -393,17 +410,17 @@ static void ngx_http_proxy_reinit_upstream(ngx_http_proxy_ctx_t *p)
ngx_chain_t *cl; ngx_chain_t *cl;
ngx_output_chain_ctx_t *output; ngx_output_chain_ctx_t *output;
output = p->upstream->output_chain_ctx;
/* reinit the request chain */ /* reinit the request chain */
for (cl = p->request->request_hunks; cl; cl = cl->next) { for (cl = p->request->request_body->bufs; cl; cl = cl->next) {
cl->hunk->pos = cl->hunk->start; cl->hunk->pos = cl->hunk->start;
cl->hunk->file_pos = 0; cl->hunk->file_pos = 0;
} }
/* reinit the ngx_output_chain() context */ /* reinit the ngx_output_chain() context */
output = p->upstream->output_chain_ctx;
output->hunk = NULL; output->hunk = NULL;
output->in = NULL; output->in = NULL;
output->free = NULL; output->free = NULL;
@ -434,6 +451,56 @@ static void ngx_http_proxy_reinit_upstream(ngx_http_proxy_ctx_t *p)
} }
#if 0
void ngx_http_proxy_upstream_busy_lock(ngx_http_proxy_ctx_t *p)
{
ngx_int_t rc;
rc = ngx_event_busy_lock(p->lcf->busy_lock, p->busy_lock);
if (rc == NGX_AGAIN) {
return;
}
if (rc == NGX_OK) {
ngx_http_proxy_connect(p);
return;
}
if (rc == NGX_ERROR) {
p->state->status = NGX_HTTP_INTERNAL_SERVER_ERROR;
ngx_http_proxy_finalize_request(p, NGX_HTTP_INTERNAL_SERVER_ERROR);
return;
}
/* rc == NGX_BUSY */
#if (NGX_HTTP_CACHE)
if (p->busy_lock->timer) {
ft_type = NGX_HTTP_PROXY_FT_MAX_WAITING;
} else {
ft_type = NGX_HTTP_PROXY_FT_BUSY_LOCK;
}
if (p->stale && (p->lcf->use_stale & ft_type)) {
ngx_http_proxy_finalize_request(p,
ngx_http_proxy_send_cached_response(p));
return;
}
#endif
p->state->status = NGX_HTTP_SERVICE_UNAVAILABLE;
ngx_http_proxy_finalize_request(p, NGX_HTTP_SERVICE_UNAVAILABLE);
}
#endif
#if 1
void ngx_http_proxy_upstream_busy_lock(ngx_http_proxy_ctx_t *p) void ngx_http_proxy_upstream_busy_lock(ngx_http_proxy_ctx_t *p)
{ {
ngx_int_t rc; ngx_int_t rc;
@ -481,6 +548,8 @@ void ngx_http_proxy_upstream_busy_lock(ngx_http_proxy_ctx_t *p)
ngx_http_proxy_finalize_request(p, NGX_HTTP_SERVICE_UNAVAILABLE); ngx_http_proxy_finalize_request(p, NGX_HTTP_SERVICE_UNAVAILABLE);
} }
#endif
static void ngx_http_proxy_connect(ngx_http_proxy_ctx_t *p) static void ngx_http_proxy_connect(ngx_http_proxy_ctx_t *p)
{ {
@ -530,17 +599,17 @@ static void ngx_http_proxy_connect(ngx_http_proxy_ctx_t *p)
ngx_http_proxy_reinit_upstream(p); ngx_http_proxy_reinit_upstream(p);
} }
if (r->request_body_hunk) { if (r->request_body->buf) {
if (!(output->free = ngx_alloc_chain_link(r->pool))) { if (!(output->free = ngx_alloc_chain_link(r->pool))) {
ngx_http_proxy_finalize_request(p, NGX_HTTP_INTERNAL_SERVER_ERROR); ngx_http_proxy_finalize_request(p, NGX_HTTP_INTERNAL_SERVER_ERROR);
return; return;
} }
output->free->hunk = r->request_body_hunk; output->free->hunk = r->request_body->buf;
output->free->next = NULL; output->free->next = NULL;
output->hunks = 1; output->hunks = 1;
r->request_body_hunk->pos = r->request_body_hunk->start; r->request_body->buf->pos = r->request_body->buf->start;
} }
p->request_sent = 0; p->request_sent = 0;
@ -590,7 +659,8 @@ static void ngx_http_proxy_send_request(ngx_http_proxy_ctx_t *p)
p->action = "sending request to upstream"; p->action = "sending request to upstream";
rc = ngx_output_chain(p->upstream->output_chain_ctx, rc = ngx_output_chain(p->upstream->output_chain_ctx,
p->request_sent ? NULL : p->request->request_hunks); p->request_sent ? NULL:
p->request->request_body->bufs);
if (rc == NGX_ERROR) { if (rc == NGX_ERROR) {
ngx_http_proxy_next_upstream(p, NGX_HTTP_PROXY_FT_ERROR); ngx_http_proxy_next_upstream(p, NGX_HTTP_PROXY_FT_ERROR);

3
src/http/ngx_http.h
View File

@ -76,8 +76,7 @@ void ngx_http_close_request(ngx_http_request_t *r, int error);
void ngx_http_close_connection(ngx_connection_t *c); void ngx_http_close_connection(ngx_connection_t *c);
ngx_int_t ngx_http_read_client_request_body(ngx_http_request_t *r, ngx_int_t ngx_http_read_client_request_body(ngx_http_request_t *r);
size_t request_buffer_size);
int ngx_http_send_header(ngx_http_request_t *r); int ngx_http_send_header(ngx_http_request_t *r);
int ngx_http_special_response_handler(ngx_http_request_t *r, int error); int ngx_http_special_response_handler(ngx_http_request_t *r, int error);

15
src/http/ngx_http_core_module.c
View File

@ -422,14 +422,19 @@ static void ngx_http_run_phases(ngx_http_request_t *r)
int ngx_http_find_location_config(ngx_http_request_t *r) int ngx_http_find_location_config(ngx_http_request_t *r)
{ {
int rc; int rc;
ngx_uint_t i, exact; ngx_uint_t i;
ngx_str_t *auto_redirect; ngx_str_t *auto_redirect;
ngx_http_core_loc_conf_t *clcf, **clcfp; ngx_http_core_loc_conf_t *clcf, **clcfp;
ngx_http_core_srv_conf_t *cscf; ngx_http_core_srv_conf_t *cscf;
#if (HAVE_PCRE)
ngx_uint_t exact;
#endif
cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module); cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
auto_redirect = NULL; auto_redirect = NULL;
#if (HAVE_PCRE)
exact = 0; exact = 0;
#endif
clcfp = cscf->locations.elts; clcfp = cscf->locations.elts;
for (i = 0; i < cscf->locations.nelts; i++) { for (i = 0; i < cscf->locations.nelts; i++) {
@ -473,7 +478,9 @@ int ngx_http_find_location_config(ngx_http_request_t *r)
r->connection->log->log_level = clcf->err_log->log_level; r->connection->log->log_level = clcf->err_log->log_level;
if (clcfp[i]->exact_match && r->uri.len == clcfp[i]->name.len) { if (clcfp[i]->exact_match && r->uri.len == clcfp[i]->name.len) {
#if (HAVE_PCRE)
exact = 1; exact = 1;
#endif
break; break;
} }
} }
@ -751,14 +758,12 @@ static int ngx_http_core_init(ngx_cycle_t *cycle)
{ {
#if 0 #if 0
ngx_http_handler_pt *h; ngx_http_handler_pt *h;
#endif
ngx_http_conf_ctx_t *ctx; ngx_http_conf_ctx_t *ctx;
ngx_http_core_main_conf_t *cmcf; ngx_http_core_main_conf_t *cmcf;
ctx = (ngx_http_conf_ctx_t *) cycle->conf_ctx[ngx_http_module.index]; ctx = (ngx_http_conf_ctx_t *) cycle->conf_ctx[ngx_http_module.index];
cmcf = ctx->main_conf[ngx_http_core_module.ctx_index]; cmcf = ctx->main_conf[ngx_http_core_module.ctx_index];
#if 0
ngx_test_null(h, ngx_push_array( ngx_test_null(h, ngx_push_array(
&cmcf->phases[NGX_HTTP_TRANSLATE_PHASE].handlers), &cmcf->phases[NGX_HTTP_TRANSLATE_PHASE].handlers),
NGX_ERROR); NGX_ERROR);
@ -775,7 +780,7 @@ static char *ngx_server_block(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
char *rv; char *rv;
ngx_http_module_t *module; ngx_http_module_t *module;
ngx_conf_t pcf; ngx_conf_t pcf;
ngx_http_conf_ctx_t *ctx, *hctx, *pctx; ngx_http_conf_ctx_t *ctx, *hctx;
ngx_http_core_main_conf_t *cmcf; ngx_http_core_main_conf_t *cmcf;
ngx_http_core_srv_conf_t *cscf, **cscfp; ngx_http_core_srv_conf_t *cscf, **cscfp;
@ -830,7 +835,9 @@ static char *ngx_server_block(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
/* parse inside server{} */ /* parse inside server{} */
pcf = *cf; pcf = *cf;
#if 0
pctx = cf->ctx; pctx = cf->ctx;
#endif
cf->ctx = ctx; cf->ctx = ctx;
cf->cmd_type = NGX_HTTP_SRV_CONF; cf->cmd_type = NGX_HTTP_SRV_CONF;
rv = ngx_conf_parse(cf, NULL); rv = ngx_conf_parse(cf, NULL);

45
src/http/ngx_http_request.h
View File

@ -116,18 +116,6 @@ typedef struct {
} ngx_http_headers_in_t; } ngx_http_headers_in_t;
typedef struct {
ngx_chain_t chain[4];
ngx_hunk_t *header_out;
ngx_hunk_t *hunk;
ngx_hunk_t *file_hunk;
ngx_file_t temp_file;
ngx_path_t *temp_path;
off_t offset;
u_char *header_in_pos;
} ngx_http_request_body_t;
typedef struct { typedef struct {
off_t start; off_t start;
off_t end; off_t end;
@ -138,7 +126,7 @@ typedef struct {
typedef struct { typedef struct {
ngx_table_t headers; /* it must be first field */ ngx_table_t headers; /* it must be first field */
int status; ngx_uint_t status;
ngx_str_t status_line; ngx_str_t status_line;
ngx_table_elt_t *server; ngx_table_elt_t *server;
@ -161,6 +149,17 @@ typedef struct {
} ngx_http_headers_out_t; } ngx_http_headers_out_t;
typedef struct {
ngx_temp_file_t *temp_file;
ngx_chain_t *bufs;
ngx_hunk_t *buf;
size_t rest;
size_t buf_size;
void (*handler) (void *data);
void *data;
} ngx_http_request_body_t;
struct ngx_http_cleanup_s { struct ngx_http_cleanup_s {
union { union {
struct { struct {
@ -195,11 +194,21 @@ struct ngx_http_request_s {
ngx_pool_t *pool; ngx_pool_t *pool;
ngx_hunk_t *header_in; ngx_hunk_t *header_in;
ngx_http_request_body_t *request_body;
ngx_http_headers_in_t headers_in; ngx_http_headers_in_t headers_in;
ngx_http_headers_out_t headers_out; ngx_http_headers_out_t headers_out;
ngx_http_request_body_t *request_body;
#if 0
ngx_temp_file_t *temp_file;
ngx_chain_t *request_hunks;
ngx_hunk_t *request_body_hunk;
size_t remaining_body_len;
void (*request_body_handler) (void *data);
void *data;
#endif
time_t lingering_time; time_t lingering_time;
ngx_uint_t method; ngx_uint_t method;
@ -225,15 +234,9 @@ struct ngx_http_request_s {
ngx_int_t phase_handler; ngx_int_t phase_handler;
ngx_http_handler_pt content_handler; ngx_http_handler_pt content_handler;
ngx_temp_file_t *temp_file;
ngx_chain_t *request_hunks;
ngx_hunk_t *request_body_hunk;
size_t remaining_body_len;
void (*request_body_handler) (void *data);
void *data;
ngx_array_t cleanup; ngx_array_t cleanup;
/* used to learn the Apache compatible response length without a header */
size_t header_size; size_t header_size;
u_char *discarded_buffer; u_char *discarded_buffer;

90
src/http/ngx_http_request_body.c
View File

@ -9,26 +9,28 @@ static void ngx_http_read_client_request_body_handler(ngx_event_t *rev);
static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r); static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r);
ngx_int_t ngx_http_read_client_request_body(ngx_http_request_t *r, ngx_int_t ngx_http_read_client_request_body(ngx_http_request_t *r)
size_t request_buffer_size)
{ {
ssize_t size; ssize_t size;
ngx_hunk_t *h; ngx_hunk_t *h;
ngx_chain_t *cl; ngx_chain_t *cl;
size = r->header_in->last - r->header_in->pos; size = r->header_in->last - r->header_in->pos;
if (size) { if (size) {
/* there is the pre-read part of the request body */ /* there is the pre-read part of the request body */
ngx_test_null(h, ngx_calloc_hunk(r->pool), NGX_ERROR); ngx_test_null(h, ngx_calloc_hunk(r->pool),
NGX_HTTP_INTERNAL_SERVER_ERROR);
h->type = NGX_HUNK_IN_MEMORY|NGX_HUNK_TEMP; h->type = NGX_HUNK_IN_MEMORY|NGX_HUNK_TEMP;
h->start = h->pos = r->header_in->pos; h->start = h->pos = r->header_in->pos;
h->end = h->last = r->header_in->last; h->end = h->last = r->header_in->last;
ngx_alloc_link_and_set_hunk(r->request_hunks, h, r->pool, NGX_ERROR); ngx_alloc_link_and_set_hunk(r->request_body->bufs, h, r->pool,
NGX_HTTP_INTERNAL_SERVER_ERROR);
if (size >= r->headers_in.content_length_n) { if (size >= r->headers_in.content_length_n) {
@ -42,28 +44,28 @@ ngx_int_t ngx_http_read_client_request_body(ngx_http_request_t *r,
} }
r->remaining_body_len = r->headers_in.content_length_n - size; r->request_body->rest = r->headers_in.content_length_n - size;
if (r->remaining_body_len if (r->request_body->rest
< request_buffer_size + (request_buffer_size >> 2)) < r->request_body->buf_size + (r->request_body->buf_size >> 2))
{ {
size = r->remaining_body_len; size = r->request_body->rest;
} else { } else {
size = request_buffer_size; size = r->request_body->buf_size;
} }
ngx_test_null(r->request_body_hunk, ngx_create_temp_hunk(r->pool, size), ngx_test_null(r->request_body->buf, ngx_create_temp_hunk(r->pool, size),
NGX_ERROR); NGX_HTTP_INTERNAL_SERVER_ERROR);
ngx_alloc_link_and_set_hunk(cl, r->request_body_hunk, r->pool, ngx_alloc_link_and_set_hunk(cl, r->request_body->buf, r->pool,
NGX_ERROR); NGX_HTTP_INTERNAL_SERVER_ERROR);
if (r->request_hunks) { if (r->request_body->bufs) {
r->request_hunks->next = cl; r->request_body->bufs->next = cl;
} else { } else {
r->request_hunks = cl; r->request_body->bufs = cl;
} }
r->connection->read->event_handler = r->connection->read->event_handler =
@ -104,10 +106,10 @@ static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r)
"http read client request body"); "http read client request body");
for ( ;; ) { for ( ;; ) {
if (r->request_body_hunk->last == r->request_body_hunk->end) { if (r->request_body->buf->last == r->request_body->buf->end) {
n = ngx_write_chain_to_temp_file(r->temp_file, n = ngx_write_chain_to_temp_file(r->request_body->temp_file,
r->request_hunks->next ? r->request_hunks->next: r->request_body->bufs->next ? r->request_body->bufs->next:
r->request_hunks); r->request_body->bufs);
/* TODO: n == 0 or not complete and level event */ /* TODO: n == 0 or not complete and level event */
@ -115,19 +117,19 @@ static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r)
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }
r->temp_file->offset += n; r->request_body->temp_file->offset += n;
r->request_body_hunk->pos = r->request_body_hunk->start; r->request_body->buf->pos = r->request_body->buf->start;
r->request_body_hunk->last = r->request_body_hunk->start; r->request_body->buf->last = r->request_body->buf->start;
} }
size = r->request_body_hunk->end - r->request_body_hunk->last; size = r->request_body->buf->end - r->request_body->buf->last;
if (size > r->remaining_body_len) { if (size > r->request_body->rest) {
size = r->remaining_body_len; size = r->request_body->rest;
} }
n = ngx_recv(c, r->request_body_hunk->last, size); n = ngx_recv(c, r->request_body->buf->last, size);
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http client request body recv " SIZE_T_FMT, n); "http client request body recv " SIZE_T_FMT, n);
@ -153,32 +155,32 @@ static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r)
return NGX_HTTP_BAD_REQUEST; return NGX_HTTP_BAD_REQUEST;
} }
r->request_body_hunk->last += n; r->request_body->buf->last += n;
r->remaining_body_len -= n; r->request_body->rest -= n;
if (r->remaining_body_len == 0) { if (r->request_body->rest == 0) {
break; break;
} }
if (r->request_body_hunk->last < r->request_body_hunk->end) { if (r->request_body->buf->last < r->request_body->buf->end) {
break; break;
} }
} }
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http client request body left " SIZE_T_FMT, "http client request body rest " SIZE_T_FMT,
r->remaining_body_len); r->request_body->rest);
if (r->remaining_body_len) { if (r->request_body->rest) {
return NGX_AGAIN; return NGX_AGAIN;
} }
if (r->temp_file->file.fd != NGX_INVALID_FILE) { if (r->request_body->temp_file->file.fd != NGX_INVALID_FILE) {
/* save the last part */ /* save the last part */
n = ngx_write_chain_to_temp_file(r->temp_file, n = ngx_write_chain_to_temp_file(r->request_body->temp_file,
r->request_hunks->next ? r->request_hunks->next: r->request_body->bufs->next ? r->request_body->bufs->next:
r->request_hunks); r->request_body->bufs);
/* TODO: n == 0 or not complete and level event */ /* TODO: n == 0 or not complete and level event */
@ -193,18 +195,18 @@ static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r)
h->type = NGX_HUNK_FILE; h->type = NGX_HUNK_FILE;
h->file_pos = 0; h->file_pos = 0;
h->file_last = r->temp_file->file.offset; h->file_last = r->request_body->temp_file->file.offset;
h->file = &r->temp_file->file; h->file = &r->request_body->temp_file->file;
if (r->request_hunks->next) { if (r->request_body->bufs->next) {
r->request_hunks->next->hunk = h; r->request_body->bufs->next->hunk = h;
} else { } else {
r->request_hunks->hunk = h; r->request_body->bufs->hunk = h;
} }
} }
r->request_body_handler(r->data); r->request_body->handler(r->request_body->data);
return NGX_OK; return NGX_OK;
} }

7
src/os/unix/ngx_freebsd_init.c
View File

@ -106,9 +106,16 @@ int ngx_os_init(ngx_log_t *log)
version = ngx_freebsd_kern_osreldate; version = ngx_freebsd_kern_osreldate;
#ifdef __DragonFly_version
ngx_log_error(NGX_LOG_INFO, log, 0,
"kern.osreldate: %d, built on %d",
version, __DragonFly_version);
#else
ngx_log_error(NGX_LOG_INFO, log, 0, ngx_log_error(NGX_LOG_INFO, log, 0,
"kern.osreldate: %d, built on %d", "kern.osreldate: %d, built on %d",
version, __FreeBSD_version); version, __FreeBSD_version);
#endif
#if (HAVE_SENDFILE) #if (HAVE_SENDFILE)

6
src/os/unix/ngx_freebsd_sendfile_chain.c
View File

@ -234,6 +234,9 @@ ngx_chain_t *ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in)
} else { } else {
rc = writev(c->fd, header.elts, header.nelts); rc = writev(c->fd, header.elts, header.nelts);
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
"writev: %d of " SIZE_T_FMT, rc, hsize);
if (rc == -1) { if (rc == -1) {
err = ngx_errno; err = ngx_errno;
@ -253,9 +256,6 @@ ngx_chain_t *ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in)
} }
sent = rc > 0 ? rc : 0; sent = rc > 0 ? rc : 0;
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
"writev: " OFF_T_FMT, sent);
} }
c->sent += sent; c->sent += sent;

18
src/os/win32/ngx_win32_config.h
View File

@ -47,6 +47,24 @@
#pragma disable_message(202) #pragma disable_message(202)
#endif #endif
#ifdef __BORLANDC__
/* the end of the precompiled headers */
#pragma hdrstop
#pragma warn -8027
#pragma warn -8057
#pragma warn -8060
/* STUB */
#pragma warn -8004
#pragma warn -8008
#pragma warn -8065
#pragma warn -8066
#pragma warn -8075
#endif
#include <ngx_auto_config.h> #include <ngx_auto_config.h>