Version bump (7258)

.hgtags

@@ -423,3 +423,4 @@ f87da7d9ca02b8ced4caa6c5eb9013ccd47b0117 release-1.13.6
 20ca4bcff108d3e66977f4d97508637093492287 release-1.13.8
 fb1212c7eca4c5328fe17d6cd95b010c67336aac release-1.13.9
 31c929e16910c38492581ef474e72fa67c28f124 release-1.13.10
+64179f242cb55fc206bca59de9bfdc4cf5ebcec7 release-1.13.11

docs/xml/nginx/changes.xml

@@ -5,6 +5,42 @@
 <change_log title="nginx">
 
 
+<changes ver="1.13.11" date="2018-04-03">
+
+<change type="feature">
+<para lang="ru">
+параметр proxy_protocol директивы listen
+теперь поддерживает протокол PROXY версии 2.
+</para>
+<para lang="en">
+the "proxy_protocol" parameter of the "listen" directive
+now supports the PROXY protocol version 2.
+</para>
+</change>
+
+<change type="bugfix">
+<para lang="ru">
+nginx не собирался с OpenSSL 1.1.1 статически на Linux.
+</para>
+<para lang="en">
+nginx could not be built with OpenSSL 1.1.1 statically on Linux.
+</para>
+</change>
+
+<change type="bugfix">
+<para lang="ru">
+в параметрах http_404, http_500 и им подобных
+директивы proxy_next_upstream.
+</para>
+<para lang="en">
+in the "http_404", "http_500", etc. parameters
+of the "proxy_next_upstream" directive.
+</para>
+</change>
+
+</changes>
+
+
 <changes ver="1.13.10" date="2018-03-20">
 
 <change type="feature">

src/core/nginx.h

@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1013011
+#define nginx_version      1013012
-#define NGINX_VERSION      "1.13.11"
+#define NGINX_VERSION      "1.13.12"
 #define NGINX_VER          "nginx/" NGINX_VERSION " by Hakase"
 #define NGINX_SERVER_FULL  NGINX_SERVER "/" NGINX_VERSION
 #define NGINX_ORIG         "nginx/" NGINX_VERSION