commit 4de5124191641709499f0b3e8c32ef84b04d2ec8
author Igor Sysoev <igor@sysoev.ru> Tue Apr 29 14:39:15 2008 +0000
committer Igor Sysoev <igor@sysoev.ru> Tue Apr 29 14:39:15 2008 +0000
tree 3f7cb5496293a00538dbdb8176d94036ebefac1b
parent 1cd3b0c3db35debb0af266ee71d90623f15277e6

fix segfault when file is deleted and open_file_cache_errors is off

src/core/ngx_open_file_cache.c

diff --git a/src/core/ngx_open_file_cache.c b/src/core/ngx_open_file_cache.c
index a1692f1..c217818 100644
--- a/src/core/ngx_open_file_cache.c
+++ b/src/core/ngx_open_file_cache.c
@@ -173,8 +173,6 @@
 
         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 */
@@ -185,6 +183,8 @@
                 goto failed;
             }
 
+            ngx_queue_remove(&file->queue);
+
             goto add_event;
         }
 
@@ -212,6 +212,8 @@
                 of->err = file->err;
             }
 
+            ngx_queue_remove(&file->queue);
+
             goto found;
         }
 
@@ -236,6 +238,8 @@
             goto failed;
         }
 
+        ngx_queue_remove(&file->queue);
+
         if (of->is_dir) {
 
             if (file->is_dir || file->err) {