IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-22 15:13:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix the previous commit

Browse Source
This commit is contained in:
Igor Sysoev 2008-06-30 12:11:47 +00:00
parent d6711d37c3
commit bf93476272
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/core/ngx_open_file_cache.c
View File

@ -189,7 +189,7 @@ ngx_open_cached_file(ngx_open_file_cache_t *cache, ngx_str_t *name,
goto add_event; goto add_event;
} }
if ((file->event && file->use_event) if (file->use_event
|| (file->event == NULL || (file->event == NULL
&& (of->uniq == 0 || of->uniq == file->uniq) && (of->uniq == 0 || of->uniq == file->uniq)
&& now - file->created < of->valid)) && now - file->created < of->valid))
@ -256,29 +256,14 @@ ngx_open_cached_file(ngx_open_file_cache_t *cache, ngx_str_t *name,
goto add_event; goto add_event;
} }
if (of->uniq == file->uniq if (of->uniq == file->uniq) {
&& of->mtime == file->mtime
&& of->size == file->size)
{
if (of->fd != file->fd) {
if (ngx_close_file(of->fd) == NGX_FILE_ERROR) {
ngx_log_error(NGX_LOG_ALERT, pool->log, ngx_errno,
ngx_close_file_n " \"%s\" failed",
name->data);
}
of->fd = file->fd;
}
file->count++; file->count++;
if (file->event) { if (file->event) {
file->use_event = 1; file->use_event = 1;
goto renew;
} }
ngx_open_file_add_event(cache, file, of, pool->log);
goto renew; goto renew;
} }
@ -353,7 +338,6 @@ create:
file->uses = 1; file->uses = 1;
file->count = 0; file->count = 0;
file->use_event = 0;
file->event = NULL; file->event = NULL;
add_event: add_event:
@ -455,17 +439,23 @@ ngx_open_and_stat_file(u_char *name, ngx_open_file_info_t *of, ngx_log_t *log)
ngx_fd_t fd; ngx_fd_t fd;
ngx_file_info_t fi; ngx_file_info_t fi;
if (of->fd != NGX_INVALID_FILE || of->test_dir) { if (of->fd != NGX_INVALID_FILE) {
if (ngx_file_info(name, &fi) == -1) { if (ngx_file_info(name, &fi) == -1) {
goto failed; goto failed;
} }
if (of->fd != NGX_INVALID_FILE && of->uniq == ngx_file_uniq(&fi)) { if (of->uniq == ngx_file_uniq(&fi)) {
goto done; goto done;
} }
if (of->test_dir && of->is_dir) { } else if (of->test_dir) {
if (ngx_file_info(name, &fi) == -1) {
goto failed;
}
if (of->is_dir) {
goto done; goto done;
} }
} }
@ -543,6 +533,8 @@ ngx_open_file_add_event(ngx_open_file_cache_t *cache,
return; return;
} }
file->use_event = 0;
file->event = ngx_calloc(sizeof(ngx_event_t), log); file->event = ngx_calloc(sizeof(ngx_event_t), log);
if (file->event== NULL) { if (file->event== NULL) {
return; return;
@ -820,6 +812,7 @@ ngx_open_file_cache_remove(ngx_event_t *ev)
/* NGX_ONESHOT_EVENT was already deleted */ /* NGX_ONESHOT_EVENT was already deleted */
file->event = NULL; file->event = NULL;
file->use_event = 0;
file->close = 1; file->close = 1;