diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-02-01 14:52:25 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-02-01 14:52:25 +0000 |
| commit | af7e5336829540d80490fc4fa7153ce2efb95954 (patch) | |
| tree | 3e5e0dfc8e736f6f579ede80f284930ae681c6b1 /src/os/win32/ngx_files.c | |
| parent | 30ee8008be32ec1b7229eff2bd0b2462146c480c (diff) | |
| download | nginx-af7e5336829540d80490fc4fa7153ce2efb95954.tar.gz nginx-af7e5336829540d80490fc4fa7153ce2efb95954.tar.bz2 | |
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
Diffstat (limited to 'src/os/win32/ngx_files.c')
| -rw-r--r-- | src/os/win32/ngx_files.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |