diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-04-29 09:28:42 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-04-29 09:28:42 +0000 |
| commit | a13b3b97eafbbe7fa6586e4f73b8c80ee478244c (patch) | |
| tree | 3bf8bd774d810a450edfcefe2c5ab7fc68010e40 /src/core | |
| parent | 8443360bac77bfbc123cc40943a8f851b5a5edd6 (diff) | |
| download | nginx-a13b3b97eafbbe7fa6586e4f73b8c80ee478244c.tar.gz nginx-a13b3b97eafbbe7fa6586e4f73b8c80ee478244c.zip | |
ignore glob no match error
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ngx_conf_file.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c index 54769fbe0..6efcd8b7d 100644 --- a/src/core/ngx_conf_file.c +++ b/src/core/ngx_conf_file.c @@ -645,10 +645,18 @@ ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) return NGX_CONF_ERROR; } + if (strpbrk((char *) file.data, "*?[") == NULL) { + + ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data); + + return ngx_conf_parse(cf, &file); + } + ngx_memzero(&gl, sizeof(ngx_glob_t)); gl.pattern = file.data; gl.log = cf->log; + gl.test = 1; if (ngx_open_glob(&gl) != NGX_OK) { ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno, |