commit aad1b89b68b0651b5729b15203081f6b4620847a
author Igor Sysoev <igor@sysoev.ru> Sun Oct 03 20:02:06 2004 +0000
committer Igor Sysoev <igor@sysoev.ru> Sun Oct 03 20:02:06 2004 +0000
tree 8a5906c3607c082e27d4d8ebc1e9a9e5b42822b5
parent 8035fd27919d1f598b0d655a3bf30200220462d3

nginx-0.1.0-2004-10-04-00:02:06 import

src/core/ngx_conf_file.c

diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index d513209..90a09d2 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -560,7 +560,7 @@
         return NGX_CONF_ERROR;
     }
 
-    ngx_log_error(NGX_LOG_INFO, cf->log, 0, "include %s", file.data);
+    ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);
 
     return ngx_conf_parse(cf, &file);
 }
@@ -597,6 +597,11 @@
     ngx_list_part_t  *part;
     ngx_open_file_t  *file;
 
+#if (NGX_SUPPRESS_WARN)
+    full.len = 0;
+    full.data = NULL;
+#endif
+
     if (name) {
         full = *name;
 
@@ -637,7 +642,7 @@
         file->name = full;
 
     } else {
-        file->fd = STDERR_FILENO;
+        file->fd = ngx_stderr_fileno;
         file->name.len = 0;
         file->name.data = NULL;
     }