nginx-0.1.3-RELEASE importrelease-0.1.3

    *) Feature: the ngx_http_autoindex_module and the autoindex directive.

    *) Feature: the proxy_set_x_url directive.

    *) Bugfix: proxy module may get caught in an endless loop when sendfile
       is not used.

3 files changed, 5 insertions, 4 deletions

diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
index bf6facd87..dea310698 100644
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -276,7 +276,7 @@ int ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir)
         return NGX_ERROR; 
     }
     
-    dir->info_valid = 1;
+    dir->valid_info = 1;
     dir->ready = 1;
 
     return NGX_OK;
diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h
index 980b5853b..6d6031537 100644
--- a/src/os/win32/ngx_files.h
+++ b/src/os/win32/ngx_files.h
@@ -129,7 +129,7 @@ int ngx_read_dir(ngx_dir_t *dir);
 #define ngx_delete_dir_n            "RemoveDirectory()"
 
 
-#define ngx_de_name(dir)            (dir)->fd.cFileName
+#define ngx_de_name(dir)            ((u_char *) (dir)->fd.cFileName)
 #define ngx_de_namelen(dir)         ngx_strlen((dir)->fd.cFileName)
 #define ngx_de_info(name, dir)      NGX_OK
 #define ngx_de_info_n               "dummy()"
diff --git a/src/os/win32/ngx_types.h b/src/os/win32/ngx_types.h
index 4536a1f6f..e7a515127 100644
--- a/src/os/win32/ngx_types.h
+++ b/src/os/win32/ngx_types.h
@@ -19,8 +19,9 @@ typedef uint64_t                    ngx_file_uniq_t;
 typedef struct {
     HANDLE            dir;
     WIN32_FIND_DATA   fd;
-    unsigned          info_valid;
-    unsigned          ready;
+
+    unsigned          valid_info:1;
+    unsigned          ready:1;
 } ngx_dir_t;