details: http://hg.nginx.org/nginx/rev/e37ec0a33901
branches:
changeset: 6069:e37ec0a33901
user: Sergey Kandaurov <pluknet@nginx.com>
date: Tue Apr 07 01:32:05 2015 +0300
description:
Core: fixed error handling on ngx_conf_full_name() failure.

diffstat:

src/core/ngx_file.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 643f2ce02f1c -r e37ec0a33901 src/core/ngx_file.c
--- a/src/core/ngx_file.c Tue Apr 07 00:07:04 2015 +0300
+++ b/src/core/ngx_file.c Tue Apr 07 01:32:05 2015 +0300
@@ -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;

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel