summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Kandaurov <pluknet@nginx.com>2015-04-07 01:32:05 +0300
committerSergey Kandaurov <pluknet@nginx.com>2015-04-07 01:32:05 +0300
commiteed7d47930be7920ca19c55ed66f9aef794ea73d (patch)
treecdfd681101429c45e64f6e1b3c747a9d02949604
parent8c82b7512758eececa878993e03ca7d4a470c00d (diff)
downloadnginx-eed7d47930be7920ca19c55ed66f9aef794ea73d.tar.gz
Core: fixed error handling on ngx_conf_full_name() failure.
-rw-r--r--src/core/ngx_file.c2
1 files changed, 1 insertions, 1 deletions
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;