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/http/modules | |
| 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/http/modules')
| -rw-r--r-- | src/http/modules/ngx_http_random_index_module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/modules/ngx_http_random_index_module.c b/src/http/modules/ngx_http_random_index_module.c index bb5544ae6..7b0ec503c 100644 --- a/src/http/modules/ngx_http_random_index_module.c +++ b/src/http/modules/ngx_http_random_index_module.c @@ -175,7 +175,7 @@ ngx_http_random_index_handler(ngx_http_request_t *r) len = ngx_de_namelen(&dir); - if (!dir.valid_type) { + if (dir.type == 0 || ngx_de_is_link(&dir)) { /* 1 byte for '/' and 1 byte for terminating '\0' */ |