back out the previous commit

This commit is contained in:
Igor Sysoev 2008-04-29 18:14:45 +00:00
parent 4de5124191
commit ada9190ed8

View File

@ -173,6 +173,8 @@ ngx_open_cached_file(ngx_open_file_cache_t *cache, ngx_str_t *name,
file->uses++;
ngx_queue_remove(&file->queue);
if (file->fd == NGX_INVALID_FILE && file->err == 0 && !file->is_dir) {
/* 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;
}
ngx_queue_remove(&file->queue);
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;
}
ngx_queue_remove(&file->queue);
goto found;
}
@ -238,8 +236,6 @@ ngx_open_cached_file(ngx_open_file_cache_t *cache, ngx_str_t *name,
goto failed;
}
ngx_queue_remove(&file->queue);
if (of->is_dir) {
if (file->is_dir || file->err) {