CERBERUS/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2026-10-21 19:41:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

included file name must be allocated in pool,

Browse source 
because it may be used in error message later
This commit is contained in:
Igor Sysoev 2008-03-03 17:12:05 +00:00
parent 5461caf920
commit 85d6a3e3db
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/core/ngx_conf_file.c
View file

@ -633,7 +633,7 @@ ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{
char *rv;
ngx_int_t n;
ngx_str_t *value, file;
ngx_str_t *value, file, name;
ngx_glob_t gl;
value = cf->args->elts;
@ -659,12 +659,15 @@ ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
rv = NGX_CONF_OK;
for ( ;; ) {
n = ngx_read_glob(&gl, &file);
n = ngx_read_glob(&gl, &name);
if (n != NGX_OK) {
break;
}
file.len = name.len++;
file.data = ngx_pstrdup(cf->pool, &name);
ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);
rv = ngx_conf_parse(cf, &file);