annotate auto/lib/openssl/makefile.msvc @ 7142:b9d919b53593 stable-1.12

Stream: relaxed next upstream condition (ticket #1317). When switching to a next upstream, some buffers could be stuck in the middle of the filter chain. A condition existed that raised an error when this happened. As it turned out, this condition prevented switching to a next upstream if ssl preread was used with the TCP protocol (see the ticket). In fact, the condition does not make sense for TCP, since after successful connection to an upstream switching to another upstream never happens. As for UDP, the issue with stuck buffers is unlikely to happen, but is still possible. Specifically, if a filter delays sending data to upstream. The condition can be relaxed to only check the "buffered" bitmask of the upstream connection. The new condition is simpler and fixes the ticket issue as well. Additionally, the upstream_out chain is now reset for UDP prior to connecting to a new upstream to prevent repeating the client data twice.
author Roman Arutyunyan <arut@nginx.com>
date Mon, 11 Sep 2017 15:32:31 +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 )