nginx-0.0.1-2003-07-24-00:01:29 import

diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index 6211c5f5c14ddd2d848dd0185efc9160bf10bf45..f7fa3f3fe92dc9eac87299398277726c85a7c7ce 100644 (file)
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -127,9 +127,9 @@ cached file
 
     size_t   size;
     time_t   mod;
-    char    *last_mod; 'Sun, 17 Mar 2002 19:39:50 GMT'
-    char    *etag;     '"a6d08-1302-3c94f106"'
-    char    *len;      '4866'
+    char    *last_mod; "Sun, 17 Mar 2002 19:39:50 GMT"
+    char    *etag;     ""a6d08-1302-3c94f106""
+    char    *len;      "4866"
 
 EV_VNODE        should notify by some signal if diretory tree is changed
                 or stat if aged >= N seconds (big enough)

diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c
index 9f422d3af1ae62f60a3e8365e1ca4af06a202991..8bda9e927981cb897585c9008a10fb6a1f31200a 100644 (file)
--- a/src/core/ngx_log.c
+++ b/src/core/ngx_log.c
@@ -66,7 +66,7 @@ void ngx_log_error_core(int level, ngx_log_t *log, ngx_err_t err,
     va_list   args;
 #endif
 #if (WIN32)
-    int       written;
+    u_int     written;
 #endif
 
     if (log->file->fd == NGX_INVALID_FILE) {

diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
index 3734bdc8319b9f252b18ec2196d19e5878ba8589..7c3b1f6d49cc150ed25d5a2ad9305329183cfece 100644 (file)
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -18,7 +18,7 @@ ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset)
 }
 
 
-int ngx_file_append_mode(ngx_fd_t *fd)
+int ngx_file_append_mode(ngx_fd_t fd)
 {
     if (SetFilePointer(fd, 0, NULL, FILE_END) == 0xFFFFFFFF) {
         if (GetLastError() != NO_ERROR) {

diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h
index ab050743720eeee359be57a7be9a936c5a5310d3..96cf000ee4d1576213d309026a58f0a3b72f519e 100644 (file)
--- a/src/os/win32/ngx_win32_config.h
+++ b/src/os/win32/ngx_win32_config.h
@@ -9,6 +9,7 @@
 #include <mswsock.h>
 #include <stddef.h>    /* offsetof */
 #include <stdio.h>
+#include <stdlib.h>
 #include <stdarg.h>
 
 #include <time.h>      /* gmtime, strftime */