nginx-0.1.0-2004-09-30-23:44:38 import

diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index 6387fadc0d35b668fd359043f77bd9cbc1355d3c..d51320908e61c51440dedf5add0a919cdd83215f 100644 (file)
--- 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 a545c61d7374ea8bfa081d6d12f9a77c71f4cc40..d0e31c9e054b516775e421926d71f06845e58e39 100644 (file)
--- 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,