changeset 6069:e37ec0a33901

Core: fixed error handling on ngx_conf_full_name() failure.
author Sergey Kandaurov <pluknet@nginx.com>
date Tue, 07 Apr 2015 01:32:05 +0300
parents 643f2ce02f1c
children 3f5465a33fa8
files src/core/ngx_file.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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, n
     }
 
     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;