From a1dea92f8199640fc79f60a2a3fb180fdf5cfd6e Mon Sep 17 00:00:00 2001 From: Hakase Date: Thu, 5 Apr 2018 08:27:35 +0900 Subject: [PATCH] Version bump (7258) --- .hgtags | 1 + docs/xml/nginx/changes.xml | 36 ++++++++++++++++++++++++++++++++++++ src/core/nginx.h | 4 ++-- 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/.hgtags b/.hgtags index dfe844f..57ed568 100644 --- a/.hgtags +++ b/.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 diff --git a/docs/xml/nginx/changes.xml b/docs/xml/nginx/changes.xml index 7cb1fcf..66eb0f7 100644 --- a/docs/xml/nginx/changes.xml +++ b/docs/xml/nginx/changes.xml @@ -5,6 +5,42 @@ + + + + +параметр proxy_protocol директивы listen +теперь поддерживает протокол PROXY версии 2. + + +the "proxy_protocol" parameter of the "listen" directive +now supports the PROXY protocol version 2. + + + + + +nginx не собирался с OpenSSL 1.1.1 статически на Linux. + + +nginx could not be built with OpenSSL 1.1.1 statically on Linux. + + + + + +в параметрах http_404, http_500 и им подобных +директивы proxy_next_upstream. + + +in the "http_404", "http_500", etc. parameters +of the "proxy_next_upstream" directive. + + + + + + diff --git a/src/core/nginx.h b/src/core/nginx.h index 5c45be7..e69404f 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1013011 -#define NGINX_VERSION "1.13.11" +#define nginx_version 1013012 +#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