# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1490368433 -10800
# Node ID d8ffff9be5cae94c99b2bf6f37fd6867035f5c27
# Parent  c1b0169e8f5448e691730b228eadfe890e929eeb
nginx-1.11.12

diff -r c1b0169e8f54 -r d8ffff9be5ca text/en/CHANGES
--- a/text/en/CHANGES	Fri Mar 24 18:04:55 2017 +0300
+++ b/text/en/CHANGES	Fri Mar 24 18:13:53 2017 +0300
@@ -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 -r c1b0169e8f54 -r d8ffff9be5ca text/ru/CHANGES.ru
--- a/text/ru/CHANGES.ru	Fri Mar 24 18:04:55 2017 +0300
+++ b/text/ru/CHANGES.ru	Fri Mar 24 18:13:53 2017 +0300
@@ -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 -r c1b0169e8f54 -r d8ffff9be5ca xml/index.xml
--- a/xml/index.xml	Fri Mar 24 18:04:55 2017 +0300
+++ b/xml/index.xml	Fri Mar 24 18:13:53 2017 +0300
@@ -7,6 +7,13 @@
 
 <news name="nginx news" link="/" lang="en">
 
+<event date="2017-03-24">
+<para>
+<link doc="en/download.xml">nginx-1.11.12</link>
+mainline version has been released.
+</para>
+</event>
+
 <event date="2017-03-21">
 <para>
 <link doc="en/download.xml">nginx-1.11.11</link>
diff -r c1b0169e8f54 -r d8ffff9be5ca xml/versions.xml
--- a/xml/versions.xml	Fri Mar 24 18:04:55 2017 +0300
+++ b/xml/versions.xml	Fri Mar 24 18:13:53 2017 +0300
@@ -9,6 +9,7 @@
 
 <download tag="mainline" changes="">
 
+<item ver="1.11.12" />
 <item ver="1.11.11" />
 <item ver="1.11.10" />
 <item ver="1.11.9" />