Mercurial > hg > nginx-vendor-current

comparison src/core/ngx_conf_file.c @ 372:6639b93e81b2 NGINX_0_6_30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.6.30 *) Change: now if an "include" directive pattern does not match any file, then nginx does not issue an error. *) Feature: now the time in directives may be specified without spaces, for example, "1h50m". *) Bugfix: memory leaks if the "ssl_verify_client" directive was on. Thanks to Chavelle Vincent. *) Bugfix: the "sub_filter" directive might set text to change into output. *) Bugfix: the "error_page" directive did not take into account arguments in redirected URI. *) Bugfix: now nginx always opens files in binary mode under Cygwin. *) Bugfix: nginx could not be built on OpenBSD; bug appeared in 0.6.15.
author Igor Sysoev <http://sysoev.ru>
date Tue, 29 Apr 2008 00:00:00 +0400
parents babd3d9efb62
children 984bb0b1399b
comparison
equal deleted inserted replaced
371:b6a2a305fdad 372:6639b93e81b2
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;