diff options
author | Igor Sysoev <igor@sysoev.ru> | 2004-09-30 23:44:38 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2004-09-30 23:44:38 +0400 |
commit | 4bed15b9b58f7ea5c1626162944db140b7119488 (patch) | |
tree | faafc4c9b995ba74373dfb4cb9a8d14ba9fd9e30 | |
parent | 0bc87e9ef438cb7d9d9c061b7306279b26c38a78 (diff) |
nginx-0.1.0-2004-09-30-23:44:38 import
-rw-r--r-- | src/core/ngx_conf_file.c | 7 | ||||
-rw-r--r-- | src/core/ngx_cycle.c | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c index 6387fadc0..d51320908 100644 --- a/src/core/ngx_conf_file.c +++ b/src/core/ngx_conf_file.c @@ -632,15 +632,12 @@ ngx_open_file_t *ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name) return NULL; } - file->fd = NGX_INVALID_FILE; - if (name) { + file->fd = NGX_INVALID_FILE; file->name = full; } else { - - /* stderr */ - + file->fd = STDERR_FILENO; file->name.len = 0; file->name.data = NULL; } diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index a545c61d7..d0e31c9e0 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -223,7 +223,7 @@ ngx_cycle_t *ngx_init_cycle(ngx_cycle_t *old_cycle) NGX_FILE_RDWR, NGX_FILE_CREATE_OR_OPEN|NGX_FILE_APPEND); -#if 0 +#if 1 log->log_level = NGX_LOG_DEBUG_ALL; #endif ngx_log_debug3(NGX_LOG_DEBUG_CORE, log, 0, |