Mercurial > hg > nginx

comparison src/core/ngx_conf_file.c @ 5784:f87afb46ccd2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Core: improved ngx_pstrdup() error handling.
author Tatsuhiko Kubo <cubicdaiya@gmail.com>
date Fri, 01 Aug 2014 20:04:14 +0900
parents 56ad171c3dd1
children 4e71788460fa
comparison
equal deleted inserted replaced
5783:dc7c139fca21 5784:f87afb46ccd2
779 break; 779 break;
780 } 780 }
781 781
782 file.len = name.len++; 782 file.len = name.len++;
783 file.data = ngx_pstrdup(cf->pool, &name); 783 file.data = ngx_pstrdup(cf->pool, &name);
784 if (file.data == NULL) {
785 return NGX_CONF_ERROR;
786 }
784 787
785 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data); 788 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);
786 789
787 rv = ngx_conf_parse(cf, &file); 790 rv = ngx_conf_parse(cf, &file);
788 791