Changes with nginx 0.7.31 19 Jan 2009v0.7.31

    *) Change: now the "try_files" directive tests files only and ignores
       directories.

    *) Feature: the "fastcgi_split_path_info" directive.

    *) Bugfixes in an "Expect" request header line support.

    *) Bugfixes in geo ranges.

    *) Bugfix: in a miss case ngx_http_memcached_module returned the "END"
       line as response body instead of default 404 page body; the bug had
       appeared in 0.7.18.
       Thanks to Maxim Dounin.

    *) Bugfix: while SMTP proxying nginx issued message "250 2.0.0 OK"
       instead of "235 2.0.0 OK"; the bug had appeared in 0.7.22.
       Thanks to Maxim Dounin.

4 files changed, 6 insertions, 7 deletions

diff --git a/src/core/nginx.h b/src/core/nginx.h
index 55b081856..b38a7b146 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -8,7 +8,7 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define NGINX_VERSION      "0.7.30"
+#define NGINX_VERSION      "0.7.31"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #define NGINX_VAR          "NGINX"
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index aa0d9ce7e..cdebf5645 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -394,10 +394,6 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
     cycle->log = cycle->new_log;
     pool->log = cycle->new_log;
 
-    if (cycle->log->log_level == 0) {
-        cycle->log->log_level = NGX_LOG_ERR;
-    }
-
 
     /* create shared memory */
 
diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c
index cc38b02da..a9221db6e 100644
--- 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;
     }
 
diff --git a/src/core/ngx_slab.c b/src/core/ngx_slab.c
index b187026d8..233544b22 100644
--- a/src/core/ngx_slab.c
+++ b/src/core/ngx_slab.c
@@ -685,7 +685,7 @@ ngx_slab_alloc_pages(ngx_slab_pool_t *pool, ngx_uint_t pages)
     }
 
     ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, NGX_ENOMEM,
-                      "ngx_slab_alloc(): failed");
+                  "ngx_slab_alloc(): failed");
 
     return NULL;
 }