From: Sergey Kandaurov <pluknet@nginx.com>
Date: Mon, 6 Apr 2015 22:32:05 +0000 (+0300)
Subject: Core: fixed error handling on ngx_conf_full_name() failure.
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=eed7d47930be7920ca19c55ed66f9aef794ea73d;p=nginx.git

Core: fixed error handling on ngx_conf_full_name() failure.
---

diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index ae2373511..ad2b3c953 100644
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -356,7 +356,7 @@ ngx_conf_set_path_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     }
 
     if (ngx_conf_full_name(cf->cycle, &path->name, 0) != NGX_OK) {
-        return NULL;
+        return NGX_CONF_ERROR;
     }
 
     path->conf_file = cf->conf_file->file.name.data;