Mercurial > hg > nginx

comparison src/core/ngx_conf_file.c @ 1980:b5263e401884

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ignore glob no match error
author Igor Sysoev <igor@sysoev.ru>
date Tue, 29 Apr 2008 09:28:42 +0000
parents ade85ba31674
children 2a92804f4109 0ebecd0c3410
comparison
equal deleted inserted replaced
1979:278a1d3b4dbf 1980:b5263e401884
643 643
644 if (ngx_conf_full_name(cf->cycle, &file, 1) == NGX_ERROR) { 644 if (ngx_conf_full_name(cf->cycle, &file, 1) == NGX_ERROR) {
645 return NGX_CONF_ERROR; 645 return NGX_CONF_ERROR;
646 } 646 }
647 647
648 if (strpbrk((char *) file.data, "*?[") == NULL) {
649
650 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);
651
652 return ngx_conf_parse(cf, &file);
653 }
654
648 ngx_memzero(&gl, sizeof(ngx_glob_t)); 655 ngx_memzero(&gl, sizeof(ngx_glob_t));
649 656
650 gl.pattern = file.data; 657 gl.pattern = file.data;
651 gl.log = cf->log; 658 gl.log = cf->log;
659 gl.test = 1;
652 660
653 if (ngx_open_glob(&gl) != NGX_OK) { 661 if (ngx_open_glob(&gl) != NGX_OK) {
654 ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno, 662 ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,
655 ngx_open_glob_n " \"%s\" failed", file.data); 663 ngx_open_glob_n " \"%s\" failed", file.data);
656 return NGX_CONF_ERROR; 664 return NGX_CONF_ERROR;