Mercurial > hg > nginx

comparison src/core/ngx_conf_file.c @ 1911:ade85ba31674

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
included file name must be allocated in pool, because it may be used in error message later
author Igor Sysoev <igor@sysoev.ru>
date Mon, 03 Mar 2008 17:12:05 +0000
parents 40d004d95d88
children b5263e401884
comparison
equal deleted inserted replaced
1910:8c64532e4875 1911:ade85ba31674
631 static char * 631 static char *
632 ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) 632 ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
633 { 633 {
634 char *rv; 634 char *rv;
635 ngx_int_t n; 635 ngx_int_t n;
636 ngx_str_t *value, file; 636 ngx_str_t *value, file, name;
637 ngx_glob_t gl; 637 ngx_glob_t gl;
638 638
639 value = cf->args->elts; 639 value = cf->args->elts;
640 file = value[1]; 640 file = value[1];
641 641
657 } 657 }
658 658
659 rv = NGX_CONF_OK; 659 rv = NGX_CONF_OK;
660 660
661 for ( ;; ) { 661 for ( ;; ) {
662 n = ngx_read_glob(&gl, &file); 662 n = ngx_read_glob(&gl, &name);
663 663
664 if (n != NGX_OK) { 664 if (n != NGX_OK) {
665 break; 665 break;
666 } 666 }
667
668 file.len = name.len++;
669 file.data = ngx_pstrdup(cf->pool, &name);
667 670
668 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data); 671 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);
669 672
670 rv = ngx_conf_parse(cf, &file); 673 rv = ngx_conf_parse(cf, &file);
671 674