nginx-0.0.7-2004-06-18-10:09:25 import

diff --git a/src/event/ngx_event_pipe.c b/src/event/ngx_event_pipe.c
index dac38befbf253d66808ee3235f7edd0accdf24c7..372cf53a8ea4a4ba7d785d6ce61e9ed1bd73a61e 100644 (file)
--- a/src/event/ngx_event_pipe.c
+++ b/src/event/ngx_event_pipe.c
@@ -502,7 +502,7 @@ ngx_int_t ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
 
 static ngx_int_t ngx_event_pipe_write_chain_to_temp_file(ngx_event_pipe_t *p)
 {
-    size_t        size, bsize;
+    ssize_t       size, bsize;
     ngx_buf_t    *b;
     ngx_chain_t  *cl, *tl, *next, *out, **ll, **last_free, fl;
 

diff --git a/src/event/ngx_event_pipe.h b/src/event/ngx_event_pipe.h
index 38c623a1387efb1b8de3dad94cba548c91a0197c..e85fc617084ed963673ea260ca5af3d38395642c 100644 (file)
--- a/src/event/ngx_event_pipe.h
+++ b/src/event/ngx_event_pipe.h
@@ -61,7 +61,7 @@ struct ngx_event_pipe_s {
     off_t              read_length;
 
     off_t              max_temp_file_size;
-    size_t             temp_file_write_size;
+    ssize_t            temp_file_write_size;
 
     ngx_msec_t         read_timeout;
     ngx_msec_t         send_timeout;

diff --git a/src/os/win32/ngx_time.h b/src/os/win32/ngx_time.h
index f86011618a9590407aa5e899445490d54ed7983a..a51c4f99ee1c749ff9452793e29eab40092e420b 100644 (file)
--- a/src/os/win32/ngx_time.h
+++ b/src/os/win32/ngx_time.h
@@ -33,7 +33,7 @@ typedef FILETIME       ngx_mtime_t;
 
 #define ngx_msleep       Sleep
 
-#define HAVE_GETIMEZONE  1
+#define HAVE_GETTIMEZONE  1
 
 ngx_int_t ngx_gettimezone(void);
 void ngx_gettimeofday(struct timeval *tp);