Mercurial > hg > nginx
comparison src/http/modules/ngx_http_random_index_module.c @ 3433:6b8284fc958d stable-0.7
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
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 01 Feb 2010 14:52:25 +0000 |
| parents | 2efa8d2fcde1 |
| children | 8152369f7037 |
comparison
equal
deleted
inserted
replaced
| 3432:20871c5e1d5d | 3433:6b8284fc958d |
|---|---|
| 173 continue; | 173 continue; |
| 174 } | 174 } |
| 175 | 175 |
| 176 len = ngx_de_namelen(&dir); | 176 len = ngx_de_namelen(&dir); |
| 177 | 177 |
| 178 if (!dir.valid_type) { | 178 if (dir.type == 0 || ngx_de_is_link(&dir)) { |
| 179 | 179 |
| 180 /* 1 byte for '/' and 1 byte for terminating '\0' */ | 180 /* 1 byte for '/' and 1 byte for terminating '\0' */ |
| 181 | 181 |
| 182 if (path.len + 1 + len + 1 > allocated) { | 182 if (path.len + 1 + len + 1 > allocated) { |
| 183 allocated = path.len + 1 + len + 1 | 183 allocated = path.len + 1 + len + 1 |