nginx-0.1.8-RELEASE importrelease-0.1.8

    *) 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.

6 files changed, 29 insertions, 12 deletions

diff --git a/src/os/win32/nginx.ico b/src/os/win32/nginx.ico
index 6fb330b51..af53a965c 100644
--- a/src/os/win32/nginx.ico
+++ b/src/os/win32/nginx.ico
diff --git a/src/os/win32/ngx_errno.h b/src/os/win32/ngx_errno.h
index 863dce879..371b7299e 100644
--- a/src/os/win32/ngx_errno.h
+++ b/src/os/win32/ngx_errno.h
@@ -21,7 +21,10 @@ typedef DWORD                      ngx_err_t;
 
 #define NGX_ENOENT                 ERROR_FILE_NOT_FOUND
 #define NGX_EACCES                 ERROR_ACCESS_DENIED
+#if 0
 #define NGX_EEXIST                 ERROR_FILE_EXISTS
+#endif
+#define NGX_EEXIST                 ERROR_ALREADY_EXISTS
 #define NGX_ENOTDIR                ERROR_PATH_NOT_FOUND
 #define NGX_EPIPE                  EPIPE
 #define NGX_EAGAIN                 WSAEWOULDBLOCK
diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
index ffd52c9bd..00d6bbc8e 100644
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -171,7 +171,8 @@ ssize_t ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl,
 }
 
 
-int ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_pool_t *pool)
+ngx_int_t ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to,
+                                ngx_pool_t *pool)
 {
     int         rc, collision;
     u_int       num;
@@ -229,7 +230,7 @@ int ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_pool_t *pool)
 
 #if 0
 
-int ngx_file_info(char *file, ngx_file_info_t *sb)
+ngx_int_t ngx_file_info(char *file, ngx_file_info_t *sb)
 {
     WIN32_FILE_ATTRIBUTE_DATA  fa;
 
@@ -252,7 +253,7 @@ int ngx_file_info(char *file, ngx_file_info_t *sb)
 #endif
 
 
-int ngx_file_info(u_char *file, ngx_file_info_t *sb)
+ngx_int_t ngx_file_info(u_char *file, ngx_file_info_t *sb)
 {
     /* Win95 */
 
@@ -266,7 +267,7 @@ int ngx_file_info(u_char *file, ngx_file_info_t *sb)
 }
 
 
-int ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir)
+ngx_int_t ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir)
 {
     ngx_cpystrn(name->data + name->len, NGX_DIR_MASK, NGX_DIR_MASK_LEN + 1);
 
@@ -283,7 +284,7 @@ int ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir)
 }
 
 
-int ngx_read_dir(ngx_dir_t *dir)
+ngx_int_t ngx_read_dir(ngx_dir_t *dir)
 {
     if (dir->ready) {
         dir->ready = 0;
@@ -298,13 +299,25 @@ int ngx_read_dir(ngx_dir_t *dir)
 }
 
 
-int ngx_file_append_mode(ngx_fd_t fd)
+ngx_int_t ngx_file_append_mode(ngx_fd_t fd)
 {
+#if 0
+    if (LockFile(fd, 0, 0, 0xffffffff, 0xffffffff) == 0) {
+        return NGX_ERROR;
+    }
+#endif
+
     if (SetFilePointer(fd, 0, NULL, FILE_END) == INVALID_SET_FILE_POINTER) {
         if (ngx_errno != NO_ERROR) {
             return NGX_ERROR;
         }
     }
 
+#if 0
+    if (UnlockFile(fd, 0, 0, 0xffffffff, 0xffffffff) == 0) {
+        return NGX_ERROR;
+    }
+#endif
+
     return NGX_OK;
 }
diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h
index 6d6031537..af0892ae0 100644
--- a/src/os/win32/ngx_files.h
+++ b/src/os/win32/ngx_files.h
@@ -44,7 +44,7 @@
 #define NGX_FILE_APPEND             0
 
 
-int ngx_file_append_mode(ngx_fd_t fd);
+ngx_int_t ngx_file_append_mode(ngx_fd_t fd);
 #define ngx_file_append_mode_n      "SetFilePointer()"
 
 
@@ -71,10 +71,11 @@ int ngx_file_append_mode(ngx_fd_t fd);
 
 #define ngx_rename_file             MoveFile
 #define ngx_rename_file_n           "MoveFile()"
-int ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_pool_t *pool);
+ngx_int_t ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to,
+                                ngx_pool_t *pool);
 
 
-int ngx_file_info(u_char *filename, ngx_file_info_t *fi);
+ngx_int_t ngx_file_info(u_char *filename, ngx_file_info_t *fi);
 #define ngx_file_info_n             "GetFileAttributesEx()"
 
 
@@ -109,11 +110,11 @@ int ngx_file_info(u_char *filename, ngx_file_info_t *fi);
 #define NGX_DIR_MASK_LEN            2
 
 
-int ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir);
+ngx_int_t ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir);
 #define ngx_open_dir_n              "FindFirstFile()"
 
 
-int ngx_read_dir(ngx_dir_t *dir);
+ngx_int_t ngx_read_dir(ngx_dir_t *dir);
 #define ngx_read_dir_n              "FindNextFile()"
 
 
diff --git a/src/os/win32/ngx_socket.h b/src/os/win32/ngx_socket.h
index d49ad2c15..88752889a 100644
--- a/src/os/win32/ngx_socket.h
+++ b/src/os/win32/ngx_socket.h
@@ -98,7 +98,7 @@ extern LPFN_GETACCEPTEXSOCKADDRS  getacceptexsockaddrs;
 extern LPFN_TRANSMITFILE          transmitfile;
 
 
-ngx_inline static int ngx_tcp_push(ngx_socket_t s) {
+static ngx_inline int ngx_tcp_push(ngx_socket_t s) {
      return 0;
 }
 
diff --git a/src/os/win32/tray.ico b/src/os/win32/tray.ico
index 077cbac27..b39e5241c 100644
--- a/src/os/win32/tray.ico
+++ b/src/os/win32/tray.ico