diff options
author | Igor Sysoev <igor@sysoev.ru> | 2011-09-14 14:12:35 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2011-09-14 14:12:35 +0000 |
commit | 7ffb73c6b78aa40eafd6589b68f2ce613b86cc00 (patch) | |
tree | 25c64878c2167e4716a3b8a92b306598fcd933ff /src/core/ngx_open_file_cache.c | |
parent | 2cc42b74c74ffce440beebd11ceb65cc48f45d75 (diff) | |
download | nginx-7ffb73c6b78aa40eafd6589b68f2ce613b86cc00.tar.gz nginx-7ffb73c6b78aa40eafd6589b68f2ce613b86cc00.zip |
Bugfix: open_file_cache did not update file info on retest.
If file inode was not changed, cached file information was not updated
on retest. As a result stale information might be cached forever if file
attributes was changed and/or file was extended.
This fix also makes obsolete r4077 change of is_directio flag handling,
since this flag is updated together with other file information.
Diffstat (limited to 'src/core/ngx_open_file_cache.c')
-rw-r--r-- | src/core/ngx_open_file_cache.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/core/ngx_open_file_cache.c b/src/core/ngx_open_file_cache.c index 1cce9e92b..1306d14b0 100644 --- a/src/core/ngx_open_file_cache.c +++ b/src/core/ngx_open_file_cache.c @@ -284,15 +284,11 @@ ngx_open_cached_file(ngx_open_file_cache_t *cache, ngx_str_t *name, if (of->uniq == file->uniq) { - file->count++; - if (file->event) { file->use_event = 1; } - of->is_directio = file->is_directio; - - goto renew; + goto update; } /* file was changed */ @@ -396,8 +392,6 @@ update: } } -renew: - file->created = now; found: |