# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1522766972 -10800
# Node ID a969c7078bc4add2e96c472569f5b693670aa30f
# Parent  b19d5d47c16cbae8dd9651b7a8c1afc99a9c3d7e
nginx-1.13.11

diff -r b19d5d47c16c -r a969c7078bc4 text/en/CHANGES
--- a/text/en/CHANGES	Wed Mar 28 22:21:53 2018 +0300
+++ b/text/en/CHANGES	Tue Apr 03 17:49:32 2018 +0300
@@ -1,4 +1,16 @@
 
+Changes with nginx 1.13.11                                       03 Apr 2018
+
+    *) Feature: the "proxy_protocol" parameter of the "listen" directive now
+       supports the PROXY protocol version 2.
+
+    *) Bugfix: nginx could not be built with OpenSSL 1.1.1 statically on
+       Linux.
+
+    *) Bugfix: in the "http_404", "http_500", etc. parameters of the
+       "proxy_next_upstream" directive.
+
+
 Changes with nginx 1.13.10                                       20 Mar 2018
 
     *) Feature: the "set" parameter of the "include" SSI directive now
diff -r b19d5d47c16c -r a969c7078bc4 text/ru/CHANGES.ru
--- a/text/ru/CHANGES.ru	Wed Mar 28 22:21:53 2018 +0300
+++ b/text/ru/CHANGES.ru	Tue Apr 03 17:49:32 2018 +0300
@@ -1,4 +1,15 @@
 
+Изменения в nginx 1.13.11                                         03.04.2018
+
+    *) Добавление: параметр proxy_protocol директивы listen теперь
+       поддерживает протокол PROXY версии 2.
+
+    *) Исправление: nginx не собирался с OpenSSL 1.1.1 статически на Linux.
+
+    *) Исправление: в параметрах http_404, http_500 и им подобных директивы
+       proxy_next_upstream.
+
+
 Изменения в nginx 1.13.10                                         20.03.2018
 
     *) Добавление: теперь параметр set в SSI-директиве include позволяет
diff -r b19d5d47c16c -r a969c7078bc4 xml/index.xml
--- a/xml/index.xml	Wed Mar 28 22:21:53 2018 +0300
+++ b/xml/index.xml	Tue Apr 03 17:49:32 2018 +0300
@@ -7,6 +7,13 @@
 
 <news name="nginx news" link="/" lang="en">
 
+<event date="2018-04-03">
+<para>
+<link doc="en/download.xml">nginx-1.13.11</link>
+mainline version has been released.
+</para>
+</event>
+
 <event date="2018-03-23">
 <para>
 <link url="https://unit.nginx.org/">unit-0.7</link>
diff -r b19d5d47c16c -r a969c7078bc4 xml/versions.xml
--- a/xml/versions.xml	Wed Mar 28 22:21:53 2018 +0300
+++ b/xml/versions.xml	Tue Apr 03 17:49:32 2018 +0300
@@ -9,6 +9,7 @@
 
 <download tag="mainline" changes="">
 
+<item ver="1.13.11" />
 <item ver="1.13.10" />
 <item ver="1.13.9" />
 <item ver="1.13.8" />