details: http://hg.nginx.org/nginx/rev/5def760fe95e
branches:
changeset: 6231:5def760fe95e
user: Maxim Dounin <mdounin@mdounin.ru>
date: Mon Aug 17 18:09:20 2015 +0300
description:
Updated OpenSSL used for win32 builds.

Note that as of OpenSSL 1.0.0, the "ms\do_ms" script (previously documented
to be used if one doesn't want to use the assembly language files) tries to
use MASM. Additionally, OpenSSL 1.0.2 finally broke MASM support. To fix
this, we now explicitly use "no-asm" in OpenSSL options.

diffstat:

misc/GNUmakefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff --git a/misc/GNUmakefile b/misc/GNUmakefile
--- a/misc/GNUmakefile
+++ b/misc/GNUmakefile
@@ -5,7 +5,7 @@ NGINX = nginx-$(VER)
TEMP = tmp

OBJS = objs.msvc8
-OPENSSL = openssl-1.0.1p
+OPENSSL = openssl-1.0.2d
ZLIB = zlib-1.2.8
PCRE = pcre-8.37

@@ -82,7 +82,7 @@ win32:
--with-mail \
--with-stream \
--with-openssl=$(OBJS)/lib/$(OPENSSL) \
- --with-openssl-opt=enable-tlsext \
+ --with-openssl-opt=no-asm \
--with-http_ssl_module \
--with-mail_ssl_module \
--with-stream_ssl_module \

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel