nginx-0.0.2-2004-03-04-10:04:55 import

3 files changed, 41 insertions, 11 deletions

diff --git a/auto/make b/auto/make
index c486de4f0..c75a099dc 100644
--- a/auto/make
+++ b/auto/make
@@ -36,21 +36,29 @@ echo                                          >> $MAKEFILE
 echo "CORE_DEPS = \\"                         >> $MAKEFILE
 for dep in $CORE_DEPS
 do
+    if [ $PLATFORM = win32 ]; then
+        dep=`echo $dep | sed -e "s/\//\\\\\\/g"`
+    fi
     echo "	$dep \\"                      >> $MAKEFILE
 done
 echo                                          >> $MAKEFILE
 
-echo "CORE_INCS = $CORE_INCS -I $OBJS"        >> $MAKEFILE
+inc=`echo "$CORE_INCS -I $OBJS" | sed -e "s/\//\\\\\\/g"`
+echo "CORE_INCS = $inc"                       >> $MAKEFILE
 echo                                          >> $MAKEFILE
 
 echo "HTTP_DEPS = \\"                         >> $MAKEFILE
 for inc in $HTTP_DEPS
 do
+    if [ $PLATFORM = win32 ]; then
+        inc=`echo $inc | sed -e "s/\//\\\\\\/g"`
+    fi
     echo "	$inc \\"                      >> $MAKEFILE
 done
 echo                                          >> $MAKEFILE
 
-echo "HTTP_INCS = $HTTP_INCS"                 >> $MAKEFILE
+inc=`echo "$HTTP_INCS" | sed -e "s/\//\\\\\\/g"`
+echo "HTTP_INCS = $inc"                       >> $MAKEFILE
 echo                                          >> $MAKEFILE
 
 
@@ -60,12 +68,21 @@ echo "nginx: \\"                              >> $MAKEFILE
 for src in $CORE_SRCS $HTTP_SRCS
 do
     obj=`echo $src | sed -e "s/\.c\$/.$OBJEXT/" -e "s/\.S\$/.$OBJEXT/"`
-    echo "	$OBJS/$obj \\"                >> $MAKEFILE
+    obj="$OBJS/$obj"
+    if [ $PLATFORM = win32 ]; then
+        obj=`echo $obj | sed -e "s/\//\\\\\\/g"`
+    fi
+
+    echo "	$obj \\"                      >> $MAKEFILE
 done
 
 for src in $NGX_MODULES_C $LINK_DEPS
 do
     obj=`echo $src | sed -e "s/\.c\$/.$OBJEXT/"`
+    if [ $PLATFORM = win32 ]; then
+        obj=`echo $obj | sed -e "s/\//\\\\\\/g"`
+    fi
+
     echo "	$obj \\"                      >> $MAKEFILE
 done
 
@@ -75,10 +92,18 @@ echo "	\$(CC) ${BINOUT}nginx \\"             >> $MAKEFILE
 for src in $CORE_SRCS $HTTP_SRCS
 do
     obj=`echo $src | sed -e "s/\.c\$/.$OBJEXT/" -e "s/\.S\$/.$OBJEXT/"`
-    echo "	$OBJS/$obj \\"                >> $MAKEFILE
+    obj="$OBJS/$obj"
+    if [ $PLATFORM = win32 ]; then
+        obj=`echo $obj | sed -e "s/\//\\\\\\/g"`
+    fi
+
+    echo "	$obj \\"                      >> $MAKEFILE
 done
 
 obj=`echo $NGX_MODULES_C | sed -e "s/\.c\$/.$OBJEXT/"`
+if [ $PLATFORM = win32 ]; then
+    obj=`echo $obj | sed -e "s/\//\\\\\\/g"`
+fi
 echo "	$obj \\"                              >> $MAKEFILE
 echo "	$CORE_LIBS \\"                        >> $MAKEFILE
 echo "	$CORE_LINK"                           >> $MAKEFILE
diff --git a/auto/os/conf b/auto/os/conf
index 837e6d304..4ae08e856 100644
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -32,8 +32,10 @@ case $PLATFORM in
         CORE_DEPS="$WIN32_DEPS"
         CORE_SRCS="$WIN32_SRCS $SELECT_SRCS $IOCP_SRCS"
         EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE $IOCP_MODULE"
+        EVENT_FOUND=YES
 
-        CFLAGS="$CFLAGS -D HAVE_AIO=1 -D HAVE_IOCP=1"
+        have=HAVE_AIO . auto/have
+        have=HAVE_IOCP . auto/have
         CORE_LIBS="$CORE_LIBS ws2_32.lib"
 
         # msvcrt.dll
diff --git a/auto/sources b/auto/sources
index c30c9a6e0..026a5e0c5 100644
--- a/auto/sources
+++ b/auto/sources
@@ -103,20 +103,21 @@ UNIX_DEPS="$CORE_DEPS $EVENT_DEPS \
             src/os/unix/ngx_process.h \
             src/os/unix/ngx_thread.h \
             src/os/unix/ngx_socket.h \
-            src/os/unix/ngx_os.h"
+            src/os/unix/ngx_os.h \
+            src/os/unix/ngx_process_cycle.h"
 
 UNIX_SRCS="$CORE_SRCS $EVENT_SRCS \
             src/os/unix/ngx_time.c \
             src/os/unix/ngx_errno.c \
-            src/os/unix/ngx_sendv.c \
             src/os/unix/ngx_files.c \
             src/os/unix/ngx_socket.c \
             src/os/unix/ngx_recv.c \
             src/os/unix/ngx_readv_chain.c \
             src/os/unix/ngx_writev_chain.c \
-            src/os/unix/ngx_posix_init.c \
+            src/os/unix/ngx_daemon.c \
             src/os/unix/ngx_process.c \
-            src/os/unix/ngx_daemon.c"
+            src/os/unix/ngx_posix_init.c \
+            src/os/unix/ngx_process_cycle.c"
 
 FREEBSD_DEPS=src/os/unix/ngx_freebsd_config.h
 FREEBSD_SRCS=src/os/unix/ngx_freebsd_init.c
@@ -144,18 +145,20 @@ WIN32_DEPS="$CORE_DEPS $EVENT_DEPS \
             src/os/win32/ngx_files.h \
             src/os/win32/ngx_process.h \
             src/os/win32/ngx_socket.h \
-            src/os/win32/ngx_os.h"
+            src/os/win32/ngx_os.h \
+            src/os/win32/ngx_process_cycle.h"
 
 WIN32_SRCS="$CORE_SRCS $EVENT_SRCS \
             src/os/win32/ngx_errno.c \
             src/os/win32/ngx_files.c \
             src/os/win32/ngx_time.c \
+            src/os/win32/ngx_process.c \
             src/os/win32/ngx_socket.c \
             src/os/win32/ngx_wsarecv.c \
             src/os/win32/ngx_wsarecv_chain.c \
             src/os/win32/ngx_wsasend_chain.c \
-            src/os/win32/ngx_sendv.c \
             src/os/win32/ngx_win32_init.c \
+            src/os/win32/ngx_process_cycle.c \
             src/event/ngx_event_acceptex.c"