nginx 1.11.12

zjlooojoe · Mar 27, 2017 · 247a79f · 247a79f
1 parent efc39e9
commit 247a79f
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 13 deletions.
diff --git a/nginx/CHANGES b/nginx/CHANGES
@@ -1,4 +1,9 @@
 
+Changes with nginx 1.11.12                                       24 Mar 2017
+
+    *) Bugfix: nginx might hog CPU; the bug had appeared in 1.11.11.
+
+
 Changes with nginx 1.11.11                                       21 Mar 2017
 
     *) Feature: the "worker_shutdown_timeout" directive.

diff --git a/nginx/CHANGES.ru b/nginx/CHANGES.ru
@@ -1,4 +1,10 @@
 
+Изменения в nginx 1.11.12                                         24.03.2017
+
+    *) Исправление: nginx мог нагружать процессор; ошибка появилась в
+       1.11.11.
+
+
 Изменения в nginx 1.11.11                                         21.03.2017
 
     *) Добавление: директива worker_shutdown_timeout.

diff --git a/nginx/src/core/nginx.h b/nginx/src/core/nginx.h
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1011011
-#define NGINX_VERSION      "1.11.11"
+#define nginx_version      1011012
+#define NGINX_VERSION      "1.11.12"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD

diff --git a/nginx/src/http/ngx_http_core_module.c b/nginx/src/http/ngx_http_core_module.c
@@ -4405,16 +4405,14 @@ ngx_http_core_root(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     if (clcf->root.data) {
 
         if ((clcf->alias != 0) == alias) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "\"%V\" directive is duplicate",
-                               &cmd->name);
-        } else {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "\"%V\" directive is duplicate, "
-                               "\"%s\" directive was specified earlier",
-                               &cmd->name, clcf->alias ? "alias" : "root");
+            return "is duplicate";
         }
 
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "\"%V\" directive is duplicate, "
+                           "\"%s\" directive was specified earlier",
+                           &cmd->name, clcf->alias ? "alias" : "root");
+
         return NGX_CONF_ERROR;
     }
 
@@ -4529,7 +4527,7 @@ ngx_http_core_limit_except(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_http_core_loc_conf_t  *clcf;
 
     if (pclcf->limit_except) {
-        return "duplicate";
+        return "is duplicate";
     }
 
     pclcf->limit_except = 0xffffffff;

diff --git a/nginx/src/http/ngx_http_request.c b/nginx/src/http/ngx_http_request.c
@@ -2904,6 +2904,7 @@ ngx_http_set_keepalive(ngx_http_request_t *r)
             }
 
             cl->buf = b;
+            cl->next = NULL;
 
             hc->busy = cl;
             hc->nbusy = 1;

diff --git a/nginx/src/http/ngx_http_script.c b/nginx/src/http/ngx_http_script.c
@@ -220,7 +220,7 @@ ngx_http_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     cv = (ngx_http_complex_value_t **) (p + cmd->offset);
 
     if (*cv != NULL) {
-        return "duplicate";
+        return "is duplicate";
     }
 
     *cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));

diff --git a/nginx/src/stream/ngx_stream_script.c b/nginx/src/stream/ngx_stream_script.c
@@ -222,7 +222,7 @@ ngx_stream_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd,
     cv = (ngx_stream_complex_value_t **) (p + cmd->offset);
 
     if (*cv != NULL) {
-        return "duplicate";
+        return "is duplicate";
     }
 
     *cv = ngx_palloc(cf->pool, sizeof(ngx_stream_complex_value_t));