annotate auto/lib/openssl/makefile.msvc @ 7155:29e9571b1989

Gzip: support for a zlib variant from Intel. A zlib variant from Intel as available from https://github.com/jtkukunas/zlib uses 64K hash instead of scaling it from the specified memory level, and also uses 16-byte padding in one of the window-sized memory buffers, and can force window bits to 13 if compression level is set to 1 and appropriate compile options are used. As a result, nginx complained with "gzip filter failed to use preallocated memory" alerts. This change improves deflate_state allocation detection by testing that items is 1 (deflate_state is the only allocation where items is 1). Additionally, on first failure to use preallocated memory we now assume that we are working with the Intel's modified zlib, and switch to using appropriate preallocations. If this does not help, we complain with the usual alerts. Previous version of this patch was published at http://mailman.nginx.org/pipermail/nginx/2014-July/044568.html. The zlib variant in question is used by default in ClearLinux from Intel, see http://mailman.nginx.org/pipermail/nginx-ru/2017-October/060421.html, http://mailman.nginx.org/pipermail/nginx-ru/2017-November/060544.html.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 18 Nov 2017 04:03:27 +0300
parents abb0a4189cf7
children a423e314c22f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
1
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
2 # Copyright (C) Igor Sysoev
4412
d620f497c50f Copyright updated.
Maxim Konovalov <maxim@nginx.com>
parents: 3488
diff changeset
3 # Copyright (C) Nginx, Inc.
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
4
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
5
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
6 all:
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
7 cd $(OPENSSL)
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
8
6862
abb0a4189cf7 Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
9 perl Configure VC-WIN32 no-shared \
abb0a4189cf7 Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
10 --prefix="%cd%/openssl" \
abb0a4189cf7 Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
11 --openssldir="%cd%/openssl/ssl" \
abb0a4189cf7 Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
12 $(OPENSSL_OPT)
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
13
6862
abb0a4189cf7 Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
14 if exist ms\do_ms.bat ( \
abb0a4189cf7 Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
15 ms\do_ms \
abb0a4189cf7 Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
16 && $(MAKE) -f ms\nt.mak \
abb0a4189cf7 Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
17 && $(MAKE) -f ms\nt.mak install \
abb0a4189cf7 Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
18 ) else ( \
abb0a4189cf7 Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
19 $(MAKE) \
abb0a4189cf7 Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
20 && $(MAKE) install_sw \
abb0a4189cf7 Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
21 )