From 925341b8ec4b638e9e8f59ac61ef795993a891e8 Mon Sep 17 00:00:00 2001 From: Hakase Date: Thu, 26 Jul 2018 12:43:16 +0900 Subject: [PATCH] Latest update - 7327, Version bump --- .hgtags | 1 + auto/lib/google-perftools/conf | 3 +- auto/lib/libgd/conf | 6 ++- auto/lib/libxslt/conf | 4 +- auto/os/linux | 2 + docs/xml/nginx/changes.xml | 86 ++++++++++++++++++++++++++++++++++ src/core/nginx.h | 4 +- src/os/unix/ngx_thread.h | 4 +- 8 files changed, 101 insertions(+), 9 deletions(-) diff --git a/.hgtags b/.hgtags index d6477c0..9b86365 100644 --- a/.hgtags +++ b/.hgtags @@ -427,3 +427,4 @@ fb1212c7eca4c5328fe17d6cd95b010c67336aac release-1.13.9 051e5fa03b92b8a564f6b12debd483d267391e82 release-1.13.12 990b3e885636d763b97ed02d0d2cfc161a4e0c09 release-1.15.0 4189160cb946bb38d0bc0a452b5eb4cdd8979fb5 release-1.15.1 +b234199c7ed8a156a6bb98f7ff58302c857c954f release-1.15.2 diff --git a/auto/lib/google-perftools/conf b/auto/lib/google-perftools/conf index 5d5ddae..7f1a911 100644 --- a/auto/lib/google-perftools/conf +++ b/auto/lib/google-perftools/conf @@ -9,7 +9,8 @@ ngx_feature_incs= ngx_feature_path= ngx_feature_libs="-lprofiler" - ngx_feature_test="ProfilerStop()" + ngx_feature_test="void ProfilerStop(void); + ProfilerStop()" . auto/feature diff --git a/auto/lib/libgd/conf b/auto/lib/libgd/conf index 87761f1..6786397 100644 --- a/auto/lib/libgd/conf +++ b/auto/lib/libgd/conf @@ -9,7 +9,8 @@ ngx_feature_incs="#include " ngx_feature_path= ngx_feature_libs="-lgd" - ngx_feature_test="gdImagePtr img = gdImageCreateFromGifPtr(1, NULL);" + ngx_feature_test="gdImagePtr img = gdImageCreateFromGifPtr(1, NULL); + (void) img" . auto/feature @@ -76,7 +77,8 @@ if [ $ngx_found = yes ]; then ngx_feature="GD WebP support" ngx_feature_name="NGX_HAVE_GD_WEBP" - ngx_feature_test="gdImagePtr img = gdImageCreateFromWebpPtr(1, NULL);" + ngx_feature_test="gdImagePtr img = gdImageCreateFromWebpPtr(1, NULL); + (void) img" . auto/feature else diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf index 3a0f37b..3063ac7 100644 --- a/auto/lib/libxslt/conf +++ b/auto/lib/libxslt/conf @@ -16,8 +16,8 @@ ngx_feature_libs="-lxml2 -lxslt" ngx_feature_test="xmlParserCtxtPtr ctxt = NULL; xsltStylesheetPtr sheet = NULL; - xmlDocPtr doc; - doc = xmlParseChunk(ctxt, NULL, 0, 0); + xmlDocPtr doc = NULL; + xmlParseChunk(ctxt, NULL, 0, 0); xsltApplyStylesheet(sheet, doc, NULL);" . auto/feature diff --git a/auto/os/linux b/auto/os/linux index 2c8a9bb..5e280ec 100644 --- a/auto/os/linux +++ b/auto/os/linux @@ -185,6 +185,8 @@ ngx_feature_test="struct __user_cap_data_struct data; data.effective = CAP_TO_MASK(CAP_NET_RAW); data.permitted = 0; + (void) header; + (void) data; (void) SYS_capset" . auto/feature diff --git a/docs/xml/nginx/changes.xml b/docs/xml/nginx/changes.xml index 6d4c5d9..bb8948d 100644 --- a/docs/xml/nginx/changes.xml +++ b/docs/xml/nginx/changes.xml @@ -5,6 +5,92 @@ + + + + +переменная $ssl_preread_protocol +в модуле ngx_stream_ssl_preread_module. + + +the $ssl_preread_protocol variable +in the ngx_stream_ssl_preread_module. + + + + + +теперь при использовании директивы reset_timedout_connection +nginx сбрасывает соединения, закрываемые с кодом 444. + + +now when using the "reset_timedout_connection" directive +nginx will reset connections being closed with the 444 code. + + + + + +уровень логгирования ошибок SSL "http request", "https proxy request", +"unsupported protocol" и "version too low" +понижен с уровня crit до info. + + +a logging level of the "http request", "https proxy request", +"unsupported protocol", and "version too low" SSL errors +has been lowered from "crit" to "info". + + + + + +запросы к DNS-серверу не отправлялись повторно, +если при первой попытке отправки происходила ошибка. + + +DNS requests were not resent +if initial sending of a request failed. + + + + + +параметр reuseport директивы listen игнорировался, +если количество рабочих процессов было задано после директивы listen. + + +the "reuseport" parameter of the "listen" directive was ignored +if the number of worker processes was specified after the "listen" directive. + + + + + +при использовании OpenSSL 1.1.0 и новее +директиву ssl_prefer_server_ciphers нельзя было выключить +в виртуальном сервере, если она была включена в сервере по умолчанию. + + +when using OpenSSL 1.1.0 or newer +it was not possible to switch off "ssl_prefer_server_ciphers" in +a virtual server if it was switched on in the default server. + + + + + +повторное использование SSL-сессий к бэкендам +не работало с протоколом TLS 1.3. + + +SSL session reuse with upstream servers +did not work with the TLS 1.3 protocol. + + + + + + diff --git a/src/core/nginx.h b/src/core/nginx.h index f837674..725cb12 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1015002 -#define NGINX_VERSION "1.15.2" +#define nginx_version 1015003 +#define NGINX_VERSION "1.15.3" #define NGINX_VER "nginx/" NGINX_VERSION " by Hakase" #define NGINX_SERVER_FULL NGINX_SERVER "/" NGINX_VERSION #define NGINX_ORIG "nginx/" NGINX_VERSION diff --git a/src/os/unix/ngx_thread.h b/src/os/unix/ngx_thread.h index 1b52dd7..e3b5e81 100644 --- a/src/os/unix/ngx_thread.h +++ b/src/os/unix/ngx_thread.h @@ -47,12 +47,12 @@ typedef uint32_t ngx_tid_t; #elif (NGX_DARWIN) typedef uint64_t ngx_tid_t; -#define NGX_TID_T_FMT "%uA" +#define NGX_TID_T_FMT "%uL" #else typedef uint64_t ngx_tid_t; -#define NGX_TID_T_FMT "%uA" +#define NGX_TID_T_FMT "%uL" #endif