# HG changeset patch # User Igor Sysoev # Date 1188810386 0 # Node ID 614090b26fbf020e987b3f8deef38cecfebbb091 # Parent 223e92651ca5ba3319250dbdda93d8b8fea142a4 test the most relevant condition first diff --git a/src/core/ngx_open_file_cache.c b/src/core/ngx_open_file_cache.c --- a/src/core/ngx_open_file_cache.c +++ b/src/core/ngx_open_file_cache.c @@ -353,8 +353,8 @@ create: update: - if ((ngx_event_flags & NGX_USE_VNODE_EVENT) - && of->events + if (of->events + && (ngx_event_flags & NGX_USE_VNODE_EVENT) && of->fd != NGX_INVALID_FILE) { file->event = ngx_calloc(sizeof(ngx_event_t), pool->log);