Mercurial > hg > nginx

comparison src/core/ngx_conf_file.c @ 449:3b1e8c9df9ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.1.0-2004-10-04-00:02:06 import
author Igor Sysoev <igor@sysoev.ru>
date Sun, 03 Oct 2004 20:02:06 +0000
parents 288f249897e7
children 295d97d70c69
comparison
equal deleted inserted replaced
448:241dc8092a33 449:3b1e8c9df9ad
558 558
559 if (ngx_conf_full_name(cf->cycle, &file) == NGX_ERROR){ 559 if (ngx_conf_full_name(cf->cycle, &file) == NGX_ERROR){
560 return NGX_CONF_ERROR; 560 return NGX_CONF_ERROR;
561 } 561 }
562 562
563 ngx_log_error(NGX_LOG_INFO, cf->log, 0, "include %s", file.data); 563 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);
564 564
565 return ngx_conf_parse(cf, &file); 565 return ngx_conf_parse(cf, &file);
566 } 566 }
567 567
568 568
594 { 594 {
595 ngx_str_t full; 595 ngx_str_t full;
596 ngx_uint_t i; 596 ngx_uint_t i;
597 ngx_list_part_t *part; 597 ngx_list_part_t *part;
598 ngx_open_file_t *file; 598 ngx_open_file_t *file;
599
600 #if (NGX_SUPPRESS_WARN)
601 full.len = 0;
602 full.data = NULL;
603 #endif
599 604
600 if (name) { 605 if (name) {
601 full = *name; 606 full = *name;
602 607
603 if (ngx_conf_full_name(cycle, &full) == NGX_ERROR) { 608 if (ngx_conf_full_name(cycle, &full) == NGX_ERROR) {
635 if (name) { 640 if (name) {
636 file->fd = NGX_INVALID_FILE; 641 file->fd = NGX_INVALID_FILE;
637 file->name = full; 642 file->name = full;
638 643
639 } else { 644 } else {
640 file->fd = STDERR_FILENO; 645 file->fd = ngx_stderr_fileno;
641 file->name.len = 0; 646 file->name.len = 0;
642 file->name.data = NULL; 647 file->name.data = NULL;
643 } 648 }
644 649
645 return file; 650 return file;