r2447, r2466, r2467 merge:

set the error level as default http error_log level

diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c
index cc38b02da1d60a678d948ea7eb67a86b65a3879c..a9221db6e35f12f156a0eaf888f622a33a6dfc25 100644 (file)
--- a/src/core/ngx_log.c
+++ b/src/core/ngx_log.c
@@ -302,7 +302,10 @@ ngx_set_error_log_levels(ngx_conf_t *cf, ngx_log_t *log)
         }
     }
 
-    if (log->log_level == NGX_LOG_DEBUG) {
+    if (log->log_level == 0) {
+        log->log_level = NGX_LOG_ERR;
+
+    } else if (log->log_level == NGX_LOG_DEBUG) {
         log->log_level = NGX_LOG_DEBUG_ALL;
     }