Mercurial > hg > nginx

comparison src/core/ngx_file.c @ 6069:e37ec0a33901

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 3281de8142f5
children 3f5465a33fa8
comparison
equal deleted inserted replaced
6068:643f2ce02f1c 6069:e37ec0a33901
354 if (path->name.data[path->name.len - 1] == '/') { 354 if (path->name.data[path->name.len - 1] == '/') {
355 path->name.len--; 355 path->name.len--;
356 } 356 }
357 357
358 if (ngx_conf_full_name(cf->cycle, &path->name, 0) != NGX_OK) { 358 if (ngx_conf_full_name(cf->cycle, &path->name, 0) != NGX_OK) {
359 return NULL; 359 return NGX_CONF_ERROR;
360 } 360 }
361 361
362 path->conf_file = cf->conf_file->file.name.data; 362 path->conf_file = cf->conf_file->file.name.data;
363 path->line = cf->conf_file->line; 363 path->line = cf->conf_file->line;
364 364