*) 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
This commit is contained in:
parent
e357ac62d1
commit
6d3af5b69b
|
@ -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) {
|
||||
|
||||
/* 1 byte for '/' and 1 byte for terminating '\0' */
|
||||
|
||||
|
|
|
@ -274,9 +274,8 @@ ngx_read_dir(ngx_dir_t *dir)
|
|||
if (dir->de) {
|
||||
#if (NGX_HAVE_D_TYPE)
|
||||
dir->type = dir->de->d_type;
|
||||
dir->valid_type = dir->type ? 1 : 0;
|
||||
#else
|
||||
dir->valid_type = 0;
|
||||
dir->type = 0;
|
||||
#endif
|
||||
return NGX_OK;
|
||||
}
|
||||
|
|
|
@ -24,7 +24,6 @@ typedef struct {
|
|||
|
||||
unsigned type:8;
|
||||
unsigned valid_info:1;
|
||||
unsigned valid_type:1;
|
||||
} ngx_dir_t;
|
||||
|
||||
|
||||
|
@ -200,31 +199,31 @@ ngx_int_t ngx_read_dir(ngx_dir_t *dir);
|
|||
#else
|
||||
#define ngx_de_namelen(dir) ngx_strlen((dir)->de->d_name)
|
||||
#endif
|
||||
#define ngx_de_info(name, dir) stat((const char *) name, &(dir)->info)
|
||||
|
||||
static ngx_inline ngx_int_t
|
||||
ngx_de_info(u_char *name, ngx_dir_t *dir)
|
||||
{
|
||||
dir->type = 0;
|
||||
return stat((const char *) name, &dir->info);
|
||||
}
|
||||
|
||||
#define ngx_de_info_n "stat()"
|
||||
#define ngx_de_link_info(name, dir) lstat((const char *) name, &(dir)->info)
|
||||
#define ngx_de_link_info_n "lstat()"
|
||||
|
||||
#if (NGX_HAVE_D_TYPE)
|
||||
|
||||
#if (NGX_LINUX)
|
||||
|
||||
/* XFS on Linux does not set dirent.d_type */
|
||||
/*
|
||||
* some file systems (e.g. XFS on Linux and CD9660 on FreeBSD)
|
||||
* do not set dirent.d_type
|
||||
*/
|
||||
|
||||
#define ngx_de_is_dir(dir) \
|
||||
(((dir)->type) ? ((dir)->type == DT_DIR) : (S_ISDIR((dir)->info.st_mode)))
|
||||
#define ngx_de_is_file(dir) \
|
||||
(((dir)->type) ? ((dir)->type == DT_REG) : (S_ISREG((dir)->info.st_mode)))
|
||||
#define ngx_de_is_link(dir) \
|
||||
(((dir)->type) ? ((dir)->type == DT_LINK) : (S_ISLNK((dir)->info.st_mode)))
|
||||
|
||||
#else
|
||||
|
||||
#define ngx_de_is_dir(dir) ((dir)->type == DT_DIR)
|
||||
#define ngx_de_is_file(dir) ((dir)->type == DT_REG)
|
||||
#define ngx_de_is_link(dir) ((dir)->type == DT_LINK)
|
||||
|
||||
#endif /* NGX_LINUX */
|
||||
(((dir)->type) ? ((dir)->type == DT_LNK) : (S_ISLNK((dir)->info.st_mode)))
|
||||
|
||||
#else
|
||||
|
||||
|
|
|
@ -322,7 +322,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;
|
||||
|
@ -338,6 +337,7 @@ ngx_read_dir(ngx_dir_t *dir)
|
|||
}
|
||||
|
||||
if (FindNextFile(dir->dir, &dir->finddata) != 0) {
|
||||
dir->type = 1;
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@ typedef struct {
|
|||
WIN32_FIND_DATA finddata;
|
||||
|
||||
unsigned valid_info:1;
|
||||
unsigned valid_type:1;
|
||||
unsigned type:1;
|
||||
unsigned ready:1;
|
||||
} ngx_dir_t;
|
||||
|
||||
|
|
Loading…
Reference in New Issue