From af7e5336829540d80490fc4fa7153ce2efb95954 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 1 Feb 2010 14:52:25 +0000
Subject: merge r3201, r3204, r3411:

ngx_http_autoindex_module fixes:

*) reset cached dirent.d_type after stat()
   this fixes slash after link to a directory in ngx_http_autoindex_module;
*) use cached dirent.d_type as hint on all systems

   the issues has been introduced in r2235

*) fix ngx_utf8_cpystrn(): it did not fully copy utf-8 string
---
 src/os/win32/ngx_files.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/os/win32/ngx_files.c')

diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
index c74ec5886..94bdc8840 100644
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -376,7 +376,6 @@ ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir)
     }
 
     dir->valid_info = 1;
-    dir->valid_type = 1;
     dir->ready = 1;
 
     return NGX_OK;
@@ -392,6 +391,7 @@ ngx_read_dir(ngx_dir_t *dir)
     }
 
     if (FindNextFile(dir->dir, &dir->finddata) != 0) {
+        dir->type = 1;
         return NGX_OK;
     }
 
-- 
cgit