From: Igor Sysoev <igor@sysoev.ru>
Date: Thu, 13 Mar 2008 12:59:25 +0000 (+0000)
Subject: fix case when errors are not cached,
X-Git-Tag: release-0.6.29~13
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=3799f5cb4155ebf00520dd93823fb3c208016900;p=nginx.git

fix case when errors are not cached,
and a file was not used often enough to keep open
and it has been removed before it was kept open
---

diff --git a/src/core/ngx_open_file_cache.c b/src/core/ngx_open_file_cache.c
index abd0e2ae9..6bb6fd252 100644
--- a/src/core/ngx_open_file_cache.c
+++ b/src/core/ngx_open_file_cache.c
@@ -411,9 +411,11 @@ failed:
 
         cache->current--;
 
-        if (ngx_close_file(file->fd) == NGX_FILE_ERROR) {
-            ngx_log_error(NGX_LOG_ALERT, pool->log, ngx_errno,
-                          ngx_close_file_n " \"%s\" failed", file->name);
+        if (of->fd != NGX_INVALID_FILE) {
+            if (ngx_close_file(file->fd) == NGX_FILE_ERROR) {
+                ngx_log_error(NGX_LOG_ALERT, pool->log, ngx_errno,
+                              ngx_close_file_n " \"%s\" failed", file->name);
+            }
         }
 
         ngx_free(file->name);