From 6612579e5a1459b05960a31bbbcfe4cd5afc319a Mon Sep 17 00:00:00 2001
From: nginx <nginx@nginx.org>
Date: Tue, 7 Apr 2015 15:42:39 +0000
Subject: Changes with nginx 1.7.12                                        07
 Apr 2015

    *) Feature: now the "tcp_nodelay" directive works with backend SSL
       connections.

    *) Feature: now thread pools can be used to read cache file headers.

    *) Bugfix: in the "proxy_request_buffering" directive.

    *) Bugfix: a segmentation fault might occur in a worker process when
       using thread pools on Linux.

    *) Bugfix: in error handling when using the "ssl_stapling" directive.
       Thanks to Filipe da Silva.

    *) Bugfix: in the ngx_http_spdy_module.
---
 src/core/nginx.h        | 4 ++--
 src/core/ngx_file.c     | 6 +++---
 src/core/ngx_spinlock.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/core')

diff --git a/src/core/nginx.h b/src/core/nginx.h
index 2e84845d2..b350ef2dc 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1007011
-#define NGINX_VERSION      "1.7.11"
+#define nginx_version      1007012
+#define NGINX_VERSION      "1.7.12"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index ae2373511..3ebd73d8b 100644
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -356,7 +356,7 @@ ngx_conf_set_path_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     }
 
     if (ngx_conf_full_name(cf->cycle, &path->name, 0) != NGX_OK) {
-        return NULL;
+        return NGX_CONF_ERROR;
     }
 
     path->conf_file = cf->conf_file->file.name.data;
@@ -372,8 +372,8 @@ ngx_conf_set_path_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         path->len += level + 1;
     }
 
-    while (i < 3) {
-        path->level[i++] = 0;
+    if (path->len > 10 + i) {
+        return "invalid value";
     }
 
     *slot = path;
diff --git a/src/core/ngx_spinlock.c b/src/core/ngx_spinlock.c
index 33477e2ee..9c93afaf1 100644
--- a/src/core/ngx_spinlock.c
+++ b/src/core/ngx_spinlock.c
@@ -42,7 +42,7 @@ ngx_spinlock(ngx_atomic_t *lock, ngx_atomic_int_t value, ngx_uint_t spin)
 
 #else
 
-#if (NGX_OLD_THREADS)
+#if (NGX_THREADS)
 
 #error ngx_spinlock() or ngx_atomic_cmp_set() are not defined !
 
-- 
cgit v1.2.1