nginx-0.0.1-2003-11-27-10:45:22 import

5 files changed, 33 insertions, 9 deletions

diff --git a/auto/fmt/fmt b/auto/fmt/fmt
index 3e19c318f..ebfbd53a9 100644
--- a/auto/fmt/fmt
+++ b/auto/fmt/fmt
@@ -15,7 +15,7 @@ do
     echo "printf(\"${FMT}\", ($NGX_TYPE) $NGX_MAX_SIZE);" >> autotest.c
     echo "return 0; }" >> autotest.c
 
-    eval "$CC_WARN $CC_TEST_FLAGS -o autotest autotest.c > /dev/null 2>&1"
+    eval "$CC_WARN $CC_TEST_FLAGS -o autotest autotest.c > $NGX_ERR 2>&1"
 
     MAX_SIZE=`echo $NGX_MAX_SIZE | sed -e "s/L*\$//"`
 
diff --git a/auto/func b/auto/func
index 553333dc0..5cde42826 100644
--- a/auto/func
+++ b/auto/func
@@ -1,13 +1,15 @@
 
 echo "checking for $NGX_FUNC"
 
+NGX_FOUND=NO
+
 func=`echo $NGX_FUNC | sed -e 's/()$//' | tr '[a-z]' '[A-Z]'`
 
 echo "$NGX_UNISTD_H" > autotest.c
 echo "$NGX_FUNC_INC" >> autotest.c
 echo "int main() { $NGX_FUNC_TEST; return 0; }" >> autotest.c
 
-eval "$CC $CC_TEST_FLAGS -o autotest autotest.c > /dev/null 2>&1"
+eval "$CC $CC_TEST_FLAGS -o autotest autotest.c > $NGX_ERR 2>&1"
 
 if [ -x autotest ]; then
     echo " + $NGX_FUNC found"
@@ -16,6 +18,9 @@ if [ -x autotest ]; then
     echo "#define HAVE_$func  1"   >> $NGX_AUTO_CONFIG_H
     echo "#endif"                  >> $NGX_AUTO_CONFIG_H
     echo                           >> $NGX_AUTO_CONFIG_H
+
+    NGX_FOUND=YES
+
 else
     echo " + $NGX_FUNC not found"
 fi
diff --git a/auto/inc b/auto/inc
index 1db95f5b1..1c84eae5a 100644
--- a/auto/inc
+++ b/auto/inc
@@ -1,7 +1,9 @@
 
 echo "checking for $NGX_INC"
 
-inc=`echo $NGX_INC | sed -e 's/\./_/' | tr '[a-z]' '[A-Z]'`
+NGX_FOUND=NO
+
+inc=`echo $NGX_INC | sed -e 's/\./_/' | sed -e 's/\//_/' | tr '[a-z]' '[A-Z]'`
 
 echo "#include <$NGX_INC>" > autotest.c
 echo "int main() { return 0; }" >> autotest.c
@@ -17,6 +19,7 @@ if [ -x autotest ]; then
     echo                          >> $NGX_AUTO_CONFIG_H
 
     eval "NGX_$inc='#include <$NGX_INC>'"
+    NGX_FOUND=YES
 
 else
     echo " + $NGX_INC not found"
diff --git a/auto/os/solaris b/auto/os/solaris
index 2fe630953..008eda655 100644
--- a/auto/os/solaris
+++ b/auto/os/solaris
@@ -11,8 +11,24 @@ CC_TEST_FLAGS="-D_FILE_OFFSET_BITS=64"
 
 CORE_LIBS="$CORE_LIBS -lsocket -lnsl"
 
-# STUB
-CFLAGS="$CFLAGS -D HAVE_DEVPOLL=1"
-EVENT_MODULES="$EVENT_MODULES $DEVPOLL_MODULE"
-CORE_SRCS="$CORE_SRCS $DEVPOLL_SRCS"
-#CORE_SRCS="$CORE_SRCS $LINUX_SENDFILE_SRCS"
+
+NGX_INC="sys/devpoll.h"; . auto/inc
+
+if [ $NGX_FOUND=YES ]; then
+    CFLAGS="$CFLAGS -D HAVE_DEVPOLL=1"
+    EVENT_MODULES="$EVENT_MODULES $DEVPOLL_MODULE"
+    CORE_SRCS="$CORE_SRCS $DEVPOLL_SRCS"
+fi
+
+
+NGX_FUNC_INC="#include <sys/sendfile.h>"
+NGX_FUNC_TEST="int fd = 1; sendfilevec_t vec[1];
+               size_t sent = 1; ssize_t n;
+               n = sendfilev(fd, vec, 1, &sent)"
+NGX_FUNC="sendfilev()"; . auto/func
+
+if [ $NGX_FOUND=YES ]; then
+    CFLAGS="$CFLAGS -D HAVE_SENDFILE=1"
+    CORE_SRCS="$CORE_SRCS $SOLARIS_SENDFILEV_SRCS"
+    CORE_LIBS="$CORE_LIBS -lsendfile"
+fi
diff --git a/auto/sources b/auto/sources
index 2f47d15f4..f26b9404e 100644
--- a/auto/sources
+++ b/auto/sources
@@ -107,7 +107,7 @@ LINUX_SENDFILE_SRCS=src/os/unix/ngx_linux_sendfile_chain.c
 
 SOLARIS_DEPS=src/os/unix/ngx_solaris_config.h
 SOLARIS_SRCS=src/os/unix/ngx_solaris_init.c
-SOLARIS_SENDFILE_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"