From d43bee8ee939992404d59ae0fec248ce46abecb0 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Sat, 20 Nov 2004 19:52:20 +0000 Subject: nginx-0.1.8-RELEASE import *) Bugfix: in the ngx_http_autoindex_module if the long file names were in the listing. *) Feature: the "^~" modifier in the location directive. *) Feature: the proxy_max_temp_file_size directive. --- auto/cc/conf | 23 +++++++++--- auto/cc/gcc | 2 +- auto/configure | 2 ++ auto/install | 1 + auto/lib/md5/make | 90 +++++++++++++++++++++++------------------------ auto/lib/pcre/make | 78 ++++++++++++++++++++++------------------- auto/lib/zlib/make | 101 ++++++++++++++++++++++++++++------------------------- auto/make | 4 +-- auto/modules | 2 ++ auto/options | 4 +++ auto/os/freebsd | 21 ++++++++--- auto/os/linux | 2 +- auto/unix | 9 +++++ 13 files changed, 196 insertions(+), 143 deletions(-) (limited to 'auto') diff --git a/auto/cc/conf b/auto/cc/conf index acb68f8a5..c1f577e4e 100644 --- a/auto/cc/conf +++ b/auto/cc/conf @@ -52,11 +52,12 @@ else . auto/cc/icc ;; -# ccc) + ccc) # # Compaq C V6.5-207 # # . auto/cc/ccc -# ;; + ngx_include_opt="-I " + ;; # acc) # # aCC: HP ANSI C++ B3910B A.03.55.02 @@ -95,7 +96,7 @@ if [ "$PLATFORM" != win32 ]; then if test -n "$NGX_LD_OPT"; then ngx_feature=--with-ld-opt=\"$NGX_LD_OPT\" - ngx_feature_name=DUMMY + ngx_feature_name="DUMMY" ngx_feature_run=no ngx_feature_incs= ngx_feature_libs= @@ -110,7 +111,7 @@ if [ "$PLATFORM" != win32 ]; then fi ngx_feature="gcc variadic macros" - ngx_feature_name=HAVE_GCC_VARIADIC_MACROS + ngx_feature_name="HAVE_GCC_VARIADIC_MACROS" ngx_feature_run=yes ngx_feature_incs="#include #define var(dummy, args...) sprintf(args)" @@ -122,7 +123,7 @@ if [ "$PLATFORM" != win32 ]; then ngx_feature="C99 variadic macros" - ngx_feature_name=HAVE_C99_VARIADIC_MACROS + ngx_feature_name="HAVE_C99_VARIADIC_MACROS" ngx_feature_run=yes ngx_feature_incs="#include #define var(dummy, ...) sprintf(__VA_ARGS__)" @@ -132,4 +133,16 @@ if [ "$PLATFORM" != win32 ]; then if (buf[0] != '1') return 1" . auto/feature + +# ngx_feature="inline" +# ngx_feature_name="DUMMY" +# ngx_feature_run=no +# ngx_feature_incs="int inline f(void) { return 1 }" +# ngx_feature_libs= +# ngx_feature_test= +# . auto/feature +# +# if [ $ngx_found = yes ]; then +# fi + fi diff --git a/auto/cc/gcc b/auto/cc/gcc index 756e3977a..d5bf1dc3d 100644 --- a/auto/cc/gcc +++ b/auto/cc/gcc @@ -3,7 +3,7 @@ # gcc 2.7.2.3, 2.8.1, 2.95.4, -# 3.0.4, 3.1.1, 3.2.3, 3.3.2, 3.3.3, 3.3.4, 3.4 +# 3.0.4, 3.1.1, 3.2.3, 3.3.2, 3.3.3, 3.3.4, 3.4, 3.4.2 # Solaris 7's /usr/ccs/bin/as does not support "-pipe" diff --git a/auto/configure b/auto/configure index b4a0b5680..d5cc7e032 100755 --- a/auto/configure +++ b/auto/configure @@ -11,6 +11,8 @@ test -d $OBJS || mkdir $OBJS echo > $NGX_AUTO_HEADERS_H echo > $NGX_AUTO_CONFIG_H +echo > $NGX_AUTOCONF_ERR + if [ $DEBUG = YES ]; then have=NGX_DEBUG . auto/have diff --git a/auto/install b/auto/install index 0da9b6dd4..bae092b72 100644 --- a/auto/install +++ b/auto/install @@ -3,6 +3,7 @@ cat << END >> $MAKEFILE + install: test -d $PREFIX || mkdir -p $PREFIX diff --git a/auto/lib/md5/make b/auto/lib/md5/make index 6e2834e6d..5dfddfa23 100644 --- a/auto/lib/md5/make +++ b/auto/lib/md5/make @@ -2,35 +2,21 @@ # Copyright (C) Igor Sysoev -case "$CC" in +case "$NGX_CC_NAME" in - cl) - makefile=makefile.msvc - opt="CPU_OPT=$CPU_OPT LIBC=$LIBC MD5_ASM=$MD5_ASM" + msvc*) + ngx_makefile=makefile.msvc + ngx_opt="CPU_OPT=$CPU_OPT LIBC=$LIBC MD5_ASM=$MD5_ASM" ;; - wcl386) - makefile=makefile.owc - opt="CPU_OPT=$CPU_OPT" + owc*) + ngx_makefile=makefile.owc + ngx_opt="CPU_OPT=$CPU_OPT" ;; - bcc32) - makefile=makefile.bcc - opt="-DCPU_OPT=$CPU_OPT -DMD5_ASM=$MD5_ASM" - ;; - -esac - - -case $PLATFORM in - - win32) - line=`echo $MD5/md5.lib: | sed -e "s/\//$ngx_regex_dirsep/g"` - echo "$line" >> $MAKEFILE - ;; - - *) - echo "$MD5/libmd5.a:" >> $MAKEFILE + bcc) + ngx_makefile=makefile.bcc + ngx_opt="-DCPU_OPT=$CPU_OPT -DMD5_ASM=$MD5_ASM" ;; esac @@ -42,12 +28,16 @@ done=NO case $PLATFORM in win32) - md5=`echo $MD5 | sed -e "s/\//$ngx_regex_dirsep/g"` + cp auto/lib/md5/$ngx_makefile $MD5 + + cat << END >> $NGX_MAKEFILE + +`echo "$MD5/md5.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` + cd `echo $MD5 | sed -e "s/\//$ngx_regex_dirsep/g"` + \$(MAKE) -f $ngx_makefile $ngx_opt + cd ..\\..\\.. - cp auto/lib/md5/$makefile $MD5 - echo " cd $md5" >> $MAKEFILE - echo " \$(MAKE) -f $makefile $opt" >> $MAKEFILE - echo " cd ..\\..\\.." >> $MAKEFILE +END done=YES ;; @@ -55,13 +45,15 @@ case $PLATFORM in SunOS:*:i86pc) if [ $MD5_ASM = YES ]; then - MD5_OPT="CFLAGS=\"$MD5_OPT -DSOL -DMD5_ASM -DL_ENDIAN\"" + cat << END >> $NGX_MAKEFILE - echo " cd $MD5 \\" >> $MAKEFILE - echo " && \$(MAKE) $MD5_OPT \\" >> $MAKEFILE - echo " MD5_ASM_OBJ=asm/mx86-sol.o \\" >> $MAKEFILE - echo " CC=\"\$(CC)\" CPP=\"\$(CPP)\" \\" >> $MAKEFILE - echo " libmd5.a" >> $MAKEFILE +$MD5/libmd5.a: $NGX_MAKEFILE + cd $MD5 \\ + && \$(MAKE) CFLAGS="$MD5_OPT -DSOL -DMD5_ASM -DL_ENDIAN" \\ + CC="\$(CC)" CPP="\$(CPP)" \\ + MD5_ASM_OBJ=asm/mx86-sol.o clean libmd5.a + +END done=YES fi @@ -73,13 +65,15 @@ case $PLATFORM in *:i386 | *:i686) if [ $MD5_ASM = YES ]; then - MD5_OPT="CFLAGS=\"$MD5_OPT -DELF -DMD5_ASM -DL_ENDIAN\"" + cat << END >> $NGX_MAKEFILE + +$MD5/libmd5.a: $NGX_MAKEFILE + cd $MD5 \\ + && \$(MAKE) CFLAGS="$MD5_OPT -DELF -DMD5_ASM -DL_ENDIAN" \\ + CC="\$(CC)" CPP="\$(CPP)" \\ + MD5_ASM_OBJ=asm/mx86-elf.o clean libmd5.a - echo " cd $MD5 \\" >> $MAKEFILE - echo " && \$(MAKE) $MD5_OPT \\" >> $MAKEFILE - echo " MD5_ASM_OBJ=asm/mx86-elf.o \\" >> $MAKEFILE - echo " CC=\"\$(CC)\" CPP=\"\$(CPP)\" \\" >> $MAKEFILE - echo " libmd5.a" >> $MAKEFILE +END done=YES fi @@ -89,10 +83,14 @@ esac if [ $done = NO ]; then - echo " cd $MD5 \\" >> $MAKEFILE - echo " && \$(MAKE) CFLAGS=\"$MD5_OPT\" \\" >> $MAKEFILE - echo " MD5_ASM_OBJ= CC=\"\$(CC)\" libmd5.a" >> $MAKEFILE -fi + cat << END >> $NGX_MAKEFILE + +$MD5/libmd5.a: $NGX_MAKEFILE + cd $MD5 \\ + && \$(MAKE) CFLAGS="$MD5_OPT" \\ + CC="\$(CC)" MD5_ASM_OBJ= clean libmd5.a -echo >> $MAKEFILE +END + +fi diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make index 714994df5..a60fedb2d 100644 --- a/auto/lib/pcre/make +++ b/auto/lib/pcre/make @@ -2,21 +2,21 @@ # Copyright (C) Igor Sysoev -case "$CC" in +case "$NGX_CC_NAME" in - cl) - makefile=makefile.msvc - opt="CPU_OPT=$CPU_OPT LIBC=$LIBC" + msvc*) + ngx_makefile=makefile.msvc + ngx_opt="CPU_OPT=$CPU_OPT LIBC=$LIBC" ;; - wcl386) - makefile=makefile.owc - opt="CPU_OPT=$CPU_OPT" + owc*) + ngx_makefile=makefile.owc + ngx_opt="CPU_OPT=$CPU_OPT" ;; - bcc32) - makefile=makefile.bcc - opt="-DCPU_OPT=$CPU_OPT" + bcc) + ngx_makefile=makefile.bcc + ngx_opt="-DCPU_OPT=$CPU_OPT" ;; esac @@ -27,39 +27,45 @@ case $PLATFORM in win32) cp auto/lib/pcre/patch.pcre.in $PCRE cp auto/lib/pcre/patch.config.in $PCRE - cp auto/lib/pcre/$makefile $PCRE + cp auto/lib/pcre/$ngx_makefile $PCRE - pcre=`echo $PCRE | sed -e "s/\//$ngx_regex_dirsep/g"` - line=`echo $PCRE/pcre.h: | sed -e "s/\//$ngx_regex_dirsep/g"` + ngx_pcre=`echo $PCRE | sed -e "s/\//$ngx_regex_dirsep/g"` - echo "$line" >> $MAKEFILE - echo " cd $pcre" >> $MAKEFILE - echo " \$(MAKE) -f $makefile pcre.h" >> $MAKEFILE - echo " cd ..\\..\\.." >> $MAKEFILE - echo >> $MAKEFILE + cat << END >> $NGX_MAKEFILE - line="$PCRE/pcre.lib: $PCRE/pcre.h" - line=`echo $line | sed -e "s/\//$ngx_regex_dirsep/g"` +`echo "$PCRE/pcre.h: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` + cd $ngx_pcre + \$(MAKE) -f $ngx_makefile pcre.h + cd ..\\..\\.. + + +`echo "$PCRE/pcre.lib: $PCRE/pcre.h" | sed -e "s/\//$ngx_regex_dirsep/g"` + cd $ngx_pcre + \$(MAKE) -f $ngx_makefile $ngx_opt + cd ..\\..\\.. + +END - echo "$line" >> $MAKEFILE - echo " cd $pcre" >> $MAKEFILE - echo " \$(MAKE) -f $makefile $opt" >> $MAKEFILE - echo " cd ..\\..\\.." >> $MAKEFILE ;; *) - PCRE_OPT="CFLAGS=\"$PCRE_OPT\"" - - echo "$PCRE/pcre.h:" >> $MAKEFILE - echo " cd $PCRE \\" >> $MAKEFILE - echo " && CC=\"\$(CC)\" $PCRE_OPT \\" >> $MAKEFILE - echo " ./configure --disable-shared" >> $MAKEFILE - echo >> $MAKEFILE - echo "$PCRE/.libs/libpcre.a: $PCRE/pcre.h" >> $MAKEFILE - echo " cd $PCRE \\" >> $MAKEFILE - echo " && \$(MAKE) libpcre.la" >> $MAKEFILE + cat << END >> $NGX_MAKEFILE + +$PCRE/pcre.h: $NGX_MAKEFILE + cd $PCRE \\ + && if [ -f Makefile ]; then \$(MAKE) distclean; fi + + cd $PCRE \\ + && CC="\$(CC)" CFLAGS="$PCRE_OPT" \\ + ./configure --disable-shared + + +$PCRE/.libs/libpcre.a: $PCRE/pcre.h + cd $PCRE \\ + && \$(MAKE) libpcre.la + +END + ;; esac - -echo >> $MAKEFILE diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make index 582276248..2e5ea8420 100644 --- a/auto/lib/zlib/make +++ b/auto/lib/zlib/make @@ -2,36 +2,22 @@ # Copyright (C) Igor Sysoev -case "$CC" in +case "$NGX_CC_NAME" in - cl) - makefile=makefile.msvc - opt="CPU_OPT=$CPU_OPT LIBC=$LIBC" + msvc*) + ngx_makefile=makefile.msvc + ngx_opt="CPU_OPT=$CPU_OPT LIBC=$LIBC" ;; - wcl386) - makefile=makefile.owc - opt="CPU_OPT=$CPU_OPT" + owc*) + ngx_makefile=makefile.owc + ngx_opt="CPU_OPT=$CPU_OPT" ;; - bcc32) - makefile=makefile.bcc - opt="-DCPU_OPT=$CPU_OPT" - ;; - -esac - - -case $PLATFORM in - - win32) - line=`echo $ZLIB/zlib.lib: | sed -e "s/\//$ngx_regex_dirsep/g"` - echo "$line" >> $MAKEFILE - ;; - - *) - echo "$ZLIB/libz.a:" >> $MAKEFILE + bcc) + ngx_makefile=makefile.bcc + ngx_opt="-DCPU_OPT=$CPU_OPT" ;; esac @@ -43,12 +29,16 @@ done=NO case $PLATFORM in win32) - zlib=`echo $ZLIB | sed -e "s/\//$ngx_regex_dirsep/g"` + cp auto/lib/zlib/$ngx_makefile $ZLIB + + cat << END >> $NGX_MAKEFILE - cp auto/lib/zlib/$makefile $ZLIB - echo " cd $zlib" >> $MAKEFILE - echo " \$(MAKE) -f $makefile $opt" >> $MAKEFILE - echo " cd ..\\..\\.." >> $MAKEFILE +`echo "$ZLIB/zlib.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` + cd `echo $ZLIB | sed -e "s/\//$ngx_regex_dirsep/g"` + \$(MAKE) -f $ngx_makefile $ngx_opt + cd ..\\..\\.. + +END done=YES ;; @@ -59,23 +49,35 @@ case $PLATFORM in *:i386 | *:i686) case $ZLIB_ASM in pentium) - echo " cd $ZLIB \\" >> $MAKEFILE - echo " && cp contrib/asm586/match.S . \\" >> $MAKEFILE - echo " && CFLAGS=\"$ZLIB_OPT -DASMV\" \\" >> $MAKEFILE - echo " CC=\"\$(CC)\" \\" >> $MAKEFILE - echo " ./configure \\" >> $MAKEFILE - echo " && \$(MAKE) OBJA=match.o libz.a" >> $MAKEFILE + + cat << END >> $NGX_MAKEFILE + +$ZLIB/libz.a: $NGX_MAKEFILE + cd $ZLIB \\ + && make clean \\ + && cp contrib/asm586/match.S . \\ + && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\ + ./configure \\ + && \$(MAKE) OBJA=match.o libz.a + +END done=YES ;; pentiumpro) - echo " cd $ZLIB \\" >> $MAKEFILE - echo " && cp contrib/asm686/match.S . \\" >> $MAKEFILE - echo " && CFLAGS=\"$ZLIB_OPT -DASMV\" \\" >> $MAKEFILE - echo " CC=\"\$(CC)\" \\" >> $MAKEFILE - echo " ./configure \\" >> $MAKEFILE - echo " && \$(MAKE) OBJA=match.o libz.a" >> $MAKEFILE + + cat << END >> $NGX_MAKEFILE + +$ZLIB/libz.a: $NGX_MAKEFILE + cd $ZLIB \\ + && make clean \\ + && cp contrib/asm686/match.S . \\ + && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\ + ./configure \\ + && \$(MAKE) OBJA=match.o libz.a + +END done=YES ;; @@ -97,11 +99,16 @@ esac if [ $done = NO ]; then - echo " cd $ZLIB \\" >> $MAKEFILE - echo " && CFLAGS=\"$ZLIB_OPT\" CC=\"\$(CC)\" \\" >> $MAKEFILE - echo " ./configure \\" >> $MAKEFILE - echo " && \$(MAKE) libz.a" >> $MAKEFILE -fi + cat << END >> $NGX_MAKEFILE + +$ZLIB/libz.a: $NGX_MAKEFILE + cd $ZLIB \\ + && make clean \\ + && CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\ + ./configure \\ + && \$(MAKE) libz.a -echo >> $MAKEFILE +END + +fi diff --git a/auto/make b/auto/make index c165078cf..55f36c90f 100644 --- a/auto/make +++ b/auto/make @@ -12,7 +12,7 @@ ngx_objs_dir=$NGX_OBJS$ngx_regex_dirsep ngx_use_pch=`echo $NGX_USE_PCH | sed -e "s/\//$ngx_regex_dirsep/g"` -cat << END >> $NGX_MAKEFILE +cat << END > $NGX_MAKEFILE CC = $CC CFLAGS = $CFLAGS @@ -49,7 +49,7 @@ ngx_all_srcs="$CORE_SRCS" # the core dependences and include pathes -ngx_deps=`echo $CORE_DEPS $NGX_PCH \ +ngx_deps=`echo $CORE_DEPS $NGX_AUTO_CONFIG_H $NGX_PCH \ | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \ -e "s/\//$ngx_regex_dirsep/g"` diff --git a/auto/modules b/auto/modules index 39dfa9df2..e9a42e362 100644 --- a/auto/modules +++ b/auto/modules @@ -7,6 +7,7 @@ if [ $EVENT_SELECT = NO -a $EVENT_FOUND = NO ]; then fi if [ $EVENT_SELECT = YES ]; then + have=HAVE_SELECT . auto/have CORE_SRCS="$CORE_SRCS $SELECT_SRCS" EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE" fi @@ -17,6 +18,7 @@ if [ $EVENT_POLL = NO -a $EVENT_FOUND = NO ]; then fi if [ $EVENT_POLL = YES ]; then + have=HAVE_POLL . auto/have CORE_SRCS="$CORE_SRCS $POLL_SRCS" EVENT_MODULES="$EVENT_MODULES $POLL_MODULE" fi diff --git a/auto/options b/auto/options index 72e5b36bf..06488c825 100644 --- a/auto/options +++ b/auto/options @@ -52,6 +52,8 @@ HTTP_PROXY=YES IMAP=NO +MODULES= + USE_PCRE=NO PCRE=NONE PCRE_OPT= @@ -118,6 +120,8 @@ do --with-imap) IMAP=YES ;; + --with-module=*) NGX_MODULES="$NGX_MODULES $values" ;; + --with-cc=*) CC="$value" ;; --with-cpp=*) CPP="$value" ;; --with-cc-opt=*) NGX_CC_OPT="$value" ;; diff --git a/auto/os/freebsd b/auto/os/freebsd index f08ef97b0..ba2e18805 100644 --- a/auto/os/freebsd +++ b/auto/os/freebsd @@ -97,9 +97,20 @@ fi if [ $EVENT_AIO = YES ]; then - have=HAVE_AIO . auto/have - EVENT_MODULES="$EVENT_MODULES $AIO_MODULE" - CORE_SRCS="$CORE_SRCS $AIO_SRCS" -else - have=HAVE_AIO . auto/nohave + if [ \( $version -lt 500000 -a $version -ge 430000 \) \ + -o $version -ge 500014 ] + then + have=HAVE_AIO . auto/have + EVENT_MODULES="$EVENT_MODULES $AIO_MODULE" + CORE_SRCS="$CORE_SRCS $AIO_SRCS" + else + +cat << END + +$0: error: the kqueue does not support AIO on this FreeBSD version + +END + + exit 1 + fi fi diff --git a/auto/os/linux b/auto/os/linux index 8518c6170..e4cbd6d03 100644 --- a/auto/os/linux +++ b/auto/os/linux @@ -48,7 +48,7 @@ fi ngx_feature="epoll" ngx_feature_name="epoll" -ngx_feature_run=yes +ngx_feature_run=no ngx_feature_incs="#include " ngx_feature_libs= ngx_feature_test="int efd = 0, fd = 1, n; diff --git a/auto/unix b/auto/unix index af9ee01df..f0e7f2e9d 100755 --- a/auto/unix +++ b/auto/unix @@ -73,6 +73,15 @@ ngx_param=TIME_T_LEN; ngx_value=$ngx_max_len; . auto/types/value # syscalls, libc calls and some features +ngx_feature="setproctitle()" +ngx_feature_name="HAVE_SETPROCTITLE" +ngx_feature_run=no +ngx_feature_incs= +ngx_feature_libs= +ngx_feature_test="setproctitle(\"test\");" +. auto/feature + + ngx_feature="pread()" ngx_feature_name="pread" ngx_feature_run=no -- cgit v1.2.3