Mercurial > hg > nginx
annotate auto/lib/openssl/conf @ 9280:da400acf3756
QUIC: fixed close timer processing with early data.
The ngx_quic_run() function uses qc->close timer to limit the handshake
duration. Normally it is removed by ngx_quic_do_init_streams() which is
called once when we are done with initial SSL processing.
The problem happens when the client sends early data and streams are
initialized in the ngx_quic_run() -> ngx_quic_handle_datagram() call.
The order of set/remove timer calls is now reversed; the close timer is
set up and the timer fires when assigned, starting the unexpected connection
close process.
The fix is to skip setting the timer if streams were initialized during
handling of the initial datagram. The idle timer for quic is set anyway,
and stream-related timeouts are managed by application layer.
author | Vladimir Khomutov <vl@wbsrv.ru> |
---|---|
date | Wed, 10 Apr 2024 09:38:10 +0300 |
parents | 0ba26c99b3a1 |
children | b40149d062cb |
rev | line source |
---|---|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
399
diff
changeset
|
1 |
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
399
diff
changeset
|
2 # Copyright (C) Igor Sysoev |
4412 | 3 # Copyright (C) Nginx, Inc. |
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
399
diff
changeset
|
4 |
399
4e21d1291a14
nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
5 |
4e21d1291a14
nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
6 if [ $OPENSSL != NONE ]; then |
4e21d1291a14
nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
7 |
8866
8c163ce5b55a
Configure: fixed QUIC support test.
Ruslan Ermilov <ru@nginx.com>
parents:
8865
diff
changeset
|
8 have=NGX_OPENSSL . auto/have |
8c163ce5b55a
Configure: fixed QUIC support test.
Ruslan Ermilov <ru@nginx.com>
parents:
8865
diff
changeset
|
9 have=NGX_SSL . auto/have |
8c163ce5b55a
Configure: fixed QUIC support test.
Ruslan Ermilov <ru@nginx.com>
parents:
8865
diff
changeset
|
10 |
9137
0ba26c99b3a1
SSL: avoid using OpenSSL config in build directory (ticket #2404).
Maxim Dounin <mdounin@mdounin.ru>
parents:
9080
diff
changeset
|
11 have=NGX_OPENSSL_NO_CONFIG . auto/have |
0ba26c99b3a1
SSL: avoid using OpenSSL config in build directory (ticket #2404).
Maxim Dounin <mdounin@mdounin.ru>
parents:
9080
diff
changeset
|
12 |
8866
8c163ce5b55a
Configure: fixed QUIC support test.
Ruslan Ermilov <ru@nginx.com>
parents:
8865
diff
changeset
|
13 if [ $USE_OPENSSL_QUIC = YES ]; then |
8c163ce5b55a
Configure: fixed QUIC support test.
Ruslan Ermilov <ru@nginx.com>
parents:
8865
diff
changeset
|
14 have=NGX_QUIC . auto/have |
9080
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
15 have=NGX_QUIC_OPENSSL_COMPAT . auto/have |
8866
8c163ce5b55a
Configure: fixed QUIC support test.
Ruslan Ermilov <ru@nginx.com>
parents:
8865
diff
changeset
|
16 fi |
8c163ce5b55a
Configure: fixed QUIC support test.
Ruslan Ermilov <ru@nginx.com>
parents:
8865
diff
changeset
|
17 |
399
4e21d1291a14
nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
18 case "$CC" in |
2712
41f993457021
OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
19 |
2846
dfec0e090265
fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents:
2817
diff
changeset
|
20 cl | bcc32) |
dfec0e090265
fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents:
2817
diff
changeset
|
21 CFLAGS="$CFLAGS -DNO_SYS_TYPES_H" |
2712
41f993457021
OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
22 |
2846
dfec0e090265
fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents:
2817
diff
changeset
|
23 CORE_INCS="$CORE_INCS $OPENSSL/openssl/include" |
dfec0e090265
fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents:
2817
diff
changeset
|
24 CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h" |
6862
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6488
diff
changeset
|
25 |
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6488
diff
changeset
|
26 if [ -f $OPENSSL/ms/do_ms.bat ]; then |
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6488
diff
changeset
|
27 # before OpenSSL 1.1.0 |
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6488
diff
changeset
|
28 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib" |
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6488
diff
changeset
|
29 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib" |
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6488
diff
changeset
|
30 else |
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6488
diff
changeset
|
31 # OpenSSL 1.1.0+ |
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6488
diff
changeset
|
32 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libssl.lib" |
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6488
diff
changeset
|
33 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libcrypto.lib" |
abb0a4189cf7
Win32: compatiblity with OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6488
diff
changeset
|
34 fi |
2712
41f993457021
OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
35 |
2731
06d53ecd70c8
*) move advapi32.lib to core libs since it's required for Registry and Event Log
Igor Sysoev <igor@sysoev.ru>
parents:
2712
diff
changeset
|
36 # libeay32.lib requires gdi32.lib |
06d53ecd70c8
*) move advapi32.lib to core libs since it's required for Registry and Event Log
Igor Sysoev <igor@sysoev.ru>
parents:
2712
diff
changeset
|
37 CORE_LIBS="$CORE_LIBS gdi32.lib" |
3488
92378c49456d
MSVC8 compatibility with OpenSSL 1.0.0
Igor Sysoev <igor@sysoev.ru>
parents:
3168
diff
changeset
|
38 # OpenSSL 1.0.0 requires crypt32.lib |
92378c49456d
MSVC8 compatibility with OpenSSL 1.0.0
Igor Sysoev <igor@sysoev.ru>
parents:
3168
diff
changeset
|
39 CORE_LIBS="$CORE_LIBS crypt32.lib" |
2712
41f993457021
OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
40 ;; |
41f993457021
OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
41 |
399
4e21d1291a14
nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
42 *) |
3168
83c940b0d18a
allow "make clean" for OpenSSL, the bug was introduced in r2874
Igor Sysoev <igor@sysoev.ru>
parents:
2893
diff
changeset
|
43 CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include" |
83c940b0d18a
allow "make clean" for OpenSSL, the bug was introduced in r2874
Igor Sysoev <igor@sysoev.ru>
parents:
2893
diff
changeset
|
44 CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h" |
83c940b0d18a
allow "make clean" for OpenSSL, the bug was introduced in r2874
Igor Sysoev <igor@sysoev.ru>
parents:
2893
diff
changeset
|
45 CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a" |
83c940b0d18a
allow "make clean" for OpenSSL, the bug was introduced in r2874
Igor Sysoev <igor@sysoev.ru>
parents:
2893
diff
changeset
|
46 CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a" |
6403
e59e617f8fcb
Configure: fixed static nginx build with OpenSSL (ticket #903).
Ruslan Ermilov <ru@nginx.com>
parents:
6380
diff
changeset
|
47 CORE_LIBS="$CORE_LIBS $NGX_LIBDL" |
7246
04ebf29eaf5b
Configure: fixed static compilation with OpenSSL 1.1.1.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6862
diff
changeset
|
48 CORE_LIBS="$CORE_LIBS $NGX_LIBPTHREAD" |
5360
3d2d3e1cf427
Win32: MinGW GCC compatibility.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
49 |
3d2d3e1cf427
Win32: MinGW GCC compatibility.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
50 if [ "$NGX_PLATFORM" = win32 ]; then |
3d2d3e1cf427
Win32: MinGW GCC compatibility.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
51 CORE_LIBS="$CORE_LIBS -lgdi32 -lcrypt32 -lws2_32" |
3d2d3e1cf427
Win32: MinGW GCC compatibility.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
52 fi |
479 | 53 ;; |
399
4e21d1291a14
nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
54 esac |
4e21d1291a14
nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
55 |
4e21d1291a14
nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
56 else |
4e21d1291a14
nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
57 |
3683
312c2f9b53ac
do not use prebuild OpenSSL Win32 libraries
Igor Sysoev <igor@sysoev.ru>
parents:
3488
diff
changeset
|
58 if [ "$NGX_PLATFORM" != win32 ]; then |
561 | 59 |
3683
312c2f9b53ac
do not use prebuild OpenSSL Win32 libraries
Igor Sysoev <igor@sysoev.ru>
parents:
3488
diff
changeset
|
60 OPENSSL=NO |
583 | 61 |
3683
312c2f9b53ac
do not use prebuild OpenSSL Win32 libraries
Igor Sysoev <igor@sysoev.ru>
parents:
3488
diff
changeset
|
62 ngx_feature="OpenSSL library" |
312c2f9b53ac
do not use prebuild OpenSSL Win32 libraries
Igor Sysoev <igor@sysoev.ru>
parents:
3488
diff
changeset
|
63 ngx_feature_name="NGX_OPENSSL" |
312c2f9b53ac
do not use prebuild OpenSSL Win32 libraries
Igor Sysoev <igor@sysoev.ru>
parents:
3488
diff
changeset
|
64 ngx_feature_run=no |
312c2f9b53ac
do not use prebuild OpenSSL Win32 libraries
Igor Sysoev <igor@sysoev.ru>
parents:
3488
diff
changeset
|
65 ngx_feature_incs="#include <openssl/ssl.h>" |
312c2f9b53ac
do not use prebuild OpenSSL Win32 libraries
Igor Sysoev <igor@sysoev.ru>
parents:
3488
diff
changeset
|
66 ngx_feature_path= |
7246
04ebf29eaf5b
Configure: fixed static compilation with OpenSSL 1.1.1.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6862
diff
changeset
|
67 ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL $NGX_LIBPTHREAD" |
6488
a57b2b8999e7
SSL: initialization changes for OpenSSL 1.1.0.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6403
diff
changeset
|
68 ngx_feature_test="SSL_CTX_set_options(NULL, 0)" |
3683
312c2f9b53ac
do not use prebuild OpenSSL Win32 libraries
Igor Sysoev <igor@sysoev.ru>
parents:
3488
diff
changeset
|
69 . auto/feature |
399
4e21d1291a14
nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
70 |
6177
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
71 if [ $ngx_found = no ]; then |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
72 |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
73 # FreeBSD port |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
74 |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
75 ngx_feature="OpenSSL library in /usr/local/" |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
76 ngx_feature_path="/usr/local/include" |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
77 |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
78 if [ $NGX_RPATH = YES ]; then |
7246
04ebf29eaf5b
Configure: fixed static compilation with OpenSSL 1.1.1.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6862
diff
changeset
|
79 ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto" |
6177
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
80 else |
7246
04ebf29eaf5b
Configure: fixed static compilation with OpenSSL 1.1.1.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6862
diff
changeset
|
81 ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto" |
6177
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
82 fi |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
83 |
7246
04ebf29eaf5b
Configure: fixed static compilation with OpenSSL 1.1.1.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6862
diff
changeset
|
84 ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" |
04ebf29eaf5b
Configure: fixed static compilation with OpenSSL 1.1.1.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6862
diff
changeset
|
85 |
6177
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
86 . auto/feature |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
87 fi |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
88 |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
89 if [ $ngx_found = no ]; then |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
90 |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
91 # NetBSD port |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
92 |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
93 ngx_feature="OpenSSL library in /usr/pkg/" |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
94 ngx_feature_path="/usr/pkg/include" |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
95 |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
96 if [ $NGX_RPATH = YES ]; then |
7246
04ebf29eaf5b
Configure: fixed static compilation with OpenSSL 1.1.1.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6862
diff
changeset
|
97 ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto" |
6177
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
98 else |
7246
04ebf29eaf5b
Configure: fixed static compilation with OpenSSL 1.1.1.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6862
diff
changeset
|
99 ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto" |
6177
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
100 fi |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
101 |
7246
04ebf29eaf5b
Configure: fixed static compilation with OpenSSL 1.1.1.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6862
diff
changeset
|
102 ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" |
04ebf29eaf5b
Configure: fixed static compilation with OpenSSL 1.1.1.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6862
diff
changeset
|
103 |
6177
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
104 . auto/feature |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
105 fi |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
106 |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
107 if [ $ngx_found = no ]; then |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
108 |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
109 # MacPorts |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
110 |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
111 ngx_feature="OpenSSL library in /opt/local/" |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
112 ngx_feature_path="/opt/local/include" |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
113 |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
114 if [ $NGX_RPATH = YES ]; then |
7246
04ebf29eaf5b
Configure: fixed static compilation with OpenSSL 1.1.1.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6862
diff
changeset
|
115 ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto" |
6177
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
116 else |
7246
04ebf29eaf5b
Configure: fixed static compilation with OpenSSL 1.1.1.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6862
diff
changeset
|
117 ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto" |
6177
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
118 fi |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
119 |
7246
04ebf29eaf5b
Configure: fixed static compilation with OpenSSL 1.1.1.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6862
diff
changeset
|
120 ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" |
04ebf29eaf5b
Configure: fixed static compilation with OpenSSL 1.1.1.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6862
diff
changeset
|
121 |
6177
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
122 . auto/feature |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
123 fi |
4d25ec8f0adb
Configure: search OpenSSL in a bunch of standard places.
Ruslan Ermilov <ru@nginx.com>
parents:
5360
diff
changeset
|
124 |
3683
312c2f9b53ac
do not use prebuild OpenSSL Win32 libraries
Igor Sysoev <igor@sysoev.ru>
parents:
3488
diff
changeset
|
125 if [ $ngx_found = yes ]; then |
312c2f9b53ac
do not use prebuild OpenSSL Win32 libraries
Igor Sysoev <igor@sysoev.ru>
parents:
3488
diff
changeset
|
126 have=NGX_SSL . auto/have |
6304
520ec1917f1d
Configure: fixed using OpenSSL include paths.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6177
diff
changeset
|
127 CORE_INCS="$CORE_INCS $ngx_feature_path" |
6380
7142b04337d6
Dynamic modules: dlopen() support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6304
diff
changeset
|
128 CORE_LIBS="$CORE_LIBS $ngx_feature_libs" |
3683
312c2f9b53ac
do not use prebuild OpenSSL Win32 libraries
Igor Sysoev <igor@sysoev.ru>
parents:
3488
diff
changeset
|
129 OPENSSL=YES |
9080
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
130 |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
131 if [ $USE_OPENSSL_QUIC = YES ]; then |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
132 |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
133 ngx_feature="OpenSSL QUIC support" |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
134 ngx_feature_name="NGX_QUIC" |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
135 ngx_feature_test="SSL_set_quic_method(NULL, NULL)" |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
136 . auto/feature |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
137 |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
138 if [ $ngx_found = no ]; then |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
139 have=NGX_QUIC_OPENSSL_COMPAT . auto/have |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
140 |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
141 ngx_feature="OpenSSL QUIC compatibility" |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
142 ngx_feature_test="SSL_CTX_add_custom_ext(NULL, 0, 0, |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
143 NULL, NULL, NULL, NULL, NULL)" |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
144 . auto/feature |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
145 fi |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
146 |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
147 if [ $ngx_found = no ]; then |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
148 cat << END |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
149 |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
150 $0: error: certain modules require OpenSSL QUIC support. |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
151 You can either do not enable the modules, or install the OpenSSL library with |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
152 QUIC support into the system, or build the OpenSSL library with QUIC support |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
153 statically from the source with nginx by using --with-openssl=<path> option. |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
154 |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
155 END |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
156 exit 1 |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
157 fi |
7da4791e0264
QUIC: OpenSSL compatibility layer.
Roman Arutyunyan <arut@nginx.com>
parents:
8866
diff
changeset
|
158 fi |
3684
4d47a0658e7d
stop ./configure on Win32 if no library sources was specified,
Igor Sysoev <igor@sysoev.ru>
parents:
3683
diff
changeset
|
159 fi |
4d47a0658e7d
stop ./configure on Win32 if no library sources was specified,
Igor Sysoev <igor@sysoev.ru>
parents:
3683
diff
changeset
|
160 fi |
4d47a0658e7d
stop ./configure on Win32 if no library sources was specified,
Igor Sysoev <igor@sysoev.ru>
parents:
3683
diff
changeset
|
161 |
4d47a0658e7d
stop ./configure on Win32 if no library sources was specified,
Igor Sysoev <igor@sysoev.ru>
parents:
3683
diff
changeset
|
162 if [ $OPENSSL != YES ]; then |
2893
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2876
diff
changeset
|
163 |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2876
diff
changeset
|
164 cat << END |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2876
diff
changeset
|
165 |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2876
diff
changeset
|
166 $0: error: SSL modules require the OpenSSL library. |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2876
diff
changeset
|
167 You can either do not enable the modules, or install the OpenSSL library |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2876
diff
changeset
|
168 into the system, or build the OpenSSL library statically from the source |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2876
diff
changeset
|
169 with nginx by using --with-openssl=<path> option. |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2876
diff
changeset
|
170 |
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2876
diff
changeset
|
171 END |
3684
4d47a0658e7d
stop ./configure on Win32 if no library sources was specified,
Igor Sysoev <igor@sysoev.ru>
parents:
3683
diff
changeset
|
172 exit 1 |
3683
312c2f9b53ac
do not use prebuild OpenSSL Win32 libraries
Igor Sysoev <igor@sysoev.ru>
parents:
3488
diff
changeset
|
173 fi |
399
4e21d1291a14
nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
174 |
8422
90b02ff6b003
Compatibility with BoringSSL master branch.
Sergey Kandaurov <pluknet@nginx.com>
parents:
8374
diff
changeset
|
175 fi |