Merge branch 'nginx' (nginx-1.15.11). Change-Id: I9221737ef721d0d5121a66a1b983524c0a74a110 Signed-off-by: Piotr Sikora <piotrsikora@google.com>
diff --git a/.hgtags b/.hgtags index 358085a..c2a4b98 100644 --- a/.hgtags +++ b/.hgtags
@@ -436,3 +436,4 @@ ee551e3f6dba336c0d875e266d7d55385f379b42 release-1.15.8 d2fd76709909767fc727a5b4affcf1dc9ca488a7 release-1.15.9 75f5c7f628411c79c7044102049f7ab4f7a246e7 release-1.15.10 +5155d0296a5ef9841f035920527ffdb771076b44 release-1.15.11
diff --git a/BUILD b/BUILD index f5a7115..f3473f9 100644 --- a/BUILD +++ b/BUILD
@@ -1537,5 +1537,5 @@ preinst = "@nginx_pkgoss//:debian_preinst", prerm = "@nginx_pkgoss//:debian_prerm", section = "httpd", - version = "1.15.10", + version = "1.15.11", )
diff --git a/auto/cc/msvc b/auto/cc/msvc index c2b9f45..eff3bed 100644 --- a/auto/cc/msvc +++ b/auto/cc/msvc
@@ -108,7 +108,7 @@ # msvc under Wine issues # C1902: Program database manager mismatch; please check your installation if [ -z "$NGX_WINE" ]; then - CFLAGS="$CFLAGS -Zi" + CFLAGS="$CFLAGS -Zi -Fd$NGX_OBJS/nginx.pdb" CORE_LINK="$CORE_LINK -debug" fi
diff --git a/build.bzl b/build.bzl index 47c40e0..9625839 100644 --- a/build.bzl +++ b/build.bzl
@@ -673,9 +673,9 @@ name = "nginx_pkgoss", build_file_content = _PKGOSS_BUILD_FILE.format(nginx = nginx) + _PKGOSS_BUILD_FILE_TAIL, - commit = "022bf685d71de5701faf171e1e7ceeb38adcb390", # nginx-1.15.10 + commit = "df8c41c48db68971d6cdff38827175717298c8a2", # nginx-1.15.11 remote = "https://nginx.googlesource.com/nginx-pkgoss", - shallow_since = "1553609229 +0300", + shallow_since = "1554808864 +0300", ) def nginx_repositories_zlib(bind):
diff --git a/docs/xml/nginx/changes.xml b/docs/xml/nginx/changes.xml index de93e32..0f68f9c 100644 --- a/docs/xml/nginx/changes.xml +++ b/docs/xml/nginx/changes.xml
@@ -5,6 +5,20 @@ <change_log title="nginx"> +<changes ver="1.15.11" date="2019-04-09"> + +<change type="bugfix"> +<para lang="ru"> +в директиве ssl_stapling_file на Windows. +</para> +<para lang="en"> +in the "ssl_stapling_file" directive on Windows. +</para> +</change> + +</changes> + + <changes ver="1.15.10" date="2019-03-26"> <change type="change">
diff --git a/misc/GNUmakefile b/misc/GNUmakefile index bf91174..2a71ce0 100644 --- a/misc/GNUmakefile +++ b/misc/GNUmakefile
@@ -82,7 +82,7 @@ --with-mail \ --with-stream \ --with-openssl=$(OBJS)/lib/$(OPENSSL) \ - --with-openssl-opt=no-asm \ + --with-openssl-opt="no-asm no-tests -D_WIN32_WINNT=0x0501" \ --with-http_ssl_module \ --with-mail_ssl_module \ --with-stream_ssl_module
diff --git a/src/core/nginx.h b/src/core/nginx.h index bec0f81..a377b06 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h
@@ -13,8 +13,8 @@ #define NGINX_NAME "nginx" #endif -#define nginx_version 1015010 -#define NGINX_VERSION "1.15.10" +#define nginx_version 1015011 +#define NGINX_VERSION "1.15.11" #define NGINX_VER NGINX_NAME "/" NGINX_VERSION #ifdef NGX_BUILD
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c index 6530954..c8c3fd9 100644 --- a/src/event/ngx_event_openssl.c +++ b/src/event/ngx_event_openssl.c
@@ -4648,6 +4648,7 @@ name = X509_get_subject_name(cert); if (name == NULL) { + X509_free(cert); return NGX_ERROR; } @@ -4699,6 +4700,7 @@ name = X509_get_issuer_name(cert); if (name == NULL) { + X509_free(cert); return NGX_ERROR; }
diff --git a/src/event/ngx_event_openssl_stapling.c b/src/event/ngx_event_openssl_stapling.c index 0bea5e7..7d0a170 100644 --- a/src/event/ngx_event_openssl_stapling.c +++ b/src/event/ngx_event_openssl_stapling.c
@@ -227,7 +227,7 @@ return NGX_ERROR; } - bio = BIO_new_file((char *) file->data, "r"); + bio = BIO_new_file((char *) file->data, "rb"); if (bio == NULL) { ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0, "BIO_new_file(\"%s\") failed", file->data);