mirror of
https://github.com/nginx/nginx.git
synced 2025-06-12 13:42:55 +08:00
back out the previous commit
This commit is contained in:
parent
4de5124191
commit
ada9190ed8
@ -173,6 +173,8 @@ ngx_open_cached_file(ngx_open_file_cache_t *cache, ngx_str_t *name,
|
|||||||
|
|
||||||
file->uses++;
|
file->uses++;
|
||||||
|
|
||||||
|
ngx_queue_remove(&file->queue);
|
||||||
|
|
||||||
if (file->fd == NGX_INVALID_FILE && file->err == 0 && !file->is_dir) {
|
if (file->fd == NGX_INVALID_FILE && file->err == 0 && !file->is_dir) {
|
||||||
|
|
||||||
/* file was not used often enough to keep open */
|
/* file was not used often enough to keep open */
|
||||||
@ -183,8 +185,6 @@ ngx_open_cached_file(ngx_open_file_cache_t *cache, ngx_str_t *name,
|
|||||||
goto failed;
|
goto failed;
|
||||||
}
|
}
|
||||||
|
|
||||||
ngx_queue_remove(&file->queue);
|
|
||||||
|
|
||||||
goto add_event;
|
goto add_event;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -212,8 +212,6 @@ ngx_open_cached_file(ngx_open_file_cache_t *cache, ngx_str_t *name,
|
|||||||
of->err = file->err;
|
of->err = file->err;
|
||||||
}
|
}
|
||||||
|
|
||||||
ngx_queue_remove(&file->queue);
|
|
||||||
|
|
||||||
goto found;
|
goto found;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -238,8 +236,6 @@ ngx_open_cached_file(ngx_open_file_cache_t *cache, ngx_str_t *name,
|
|||||||
goto failed;
|
goto failed;
|
||||||
}
|
}
|
||||||
|
|
||||||
ngx_queue_remove(&file->queue);
|
|
||||||
|
|
||||||
if (of->is_dir) {
|
if (of->is_dir) {
|
||||||
|
|
||||||
if (file->is_dir || file->err) {
|
if (file->is_dir || file->err) {
|
||||||
|
Loading…
Reference in New Issue
Block a user