Skip to content

Commit 4e40c13

Browse files
zhuizhuhaomengzhuizhuhaomeng
committed
tests: update openssl to 3.5.0.
1 parent 9688812 commit 4e40c13

File tree

5 files changed

+54
-60
lines changed

5 files changed

+54
-60
lines changed

‎.travis.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ env:
4646
- LUAJIT_LIB=$LUAJIT_PREFIX/lib
4747
- LUAJIT_INC=$LUAJIT_PREFIX/include/luajit-2.1
4848
- LUA_INCLUDE_DIR=$LUAJIT_INC
49-
- PCRE_PREFIX=/usr/local/openresty/pcre2
50-
- PCRE_LIB=$PCRE_PREFIX/lib
51-
- PCRE_INC=$PCRE_PREFIX/include
49+
- PCRE2_PREFIX=/usr/local/openresty/pcre2
50+
- PCRE2_LIB=$PCRE2_PREFIX/lib
51+
- PCRE2_INC=$PCRE2_PREFIX/include
5252
- OPENSSL_PREFIX=/usr/local/openresty/openssl3
5353
- OPENSSL_LIB=$OPENSSL_PREFIX/lib
5454
- OPENSSL_INC=$OPENSSL_PREFIX/include
@@ -60,9 +60,9 @@ env:
6060
- TEST_NGINX_SLEEP=0.006
6161
- MALLOC_PERTURB_=9
6262
jobs:
63-
- NGINX_VERSION=1.27.1 OPENSSL_VER=3.4.1 OPENSSL_PATCH_VER=3.4.1 TEST_NGINX_TIMEOUT=5 PCRE2_VER=10.45
64-
- NGINX_VERSION=1.27.1 OPENSSL_VER=3.4.1 OPENSSL_PATCH_VER=3.4.1 TEST_NGINX_TIMEOUT=5 PCRE2_VER=10.45 TEST_NGINX_USE_HTTP2=1
65-
- NGINX_VERSION=1.27.1 OPENSSL_VER=3.4.1 OPENSSL_PATCH_VER=3.4.1 TEST_NGINX_USE_HTTP3=1 TEST_NGINX_QUIC_IDLE_TIMEOUT=3 PCRE2_VER=10.45
63+
- NGINX_VERSION=1.27.1 OPENSSL_VER=3.5.0 OPENSSL_PATCH_VER=3.5.0 TEST_NGINX_TIMEOUT=5 PCRE2_VER=10.45
64+
- NGINX_VERSION=1.27.1 OPENSSL_VER=3.5.0 OPENSSL_PATCH_VER=3.5.0 TEST_NGINX_TIMEOUT=5 PCRE2_VER=10.45 TEST_NGINX_USE_HTTP2=1
65+
- NGINX_VERSION=1.27.1 OPENSSL_VER=3.5.0 OPENSSL_PATCH_VER=3.5.0 TEST_NGINX_USE_HTTP3=1 TEST_NGINX_QUIC_IDLE_TIMEOUT=3 PCRE2_VER=10.45
6666
- NGINX_VERSION=1.27.1 BORINGSSL=1 TEST_NGINX_USE_HTTP3=1 TEST_NGINX_QUIC_IDLE_TIMEOUT=3 PCRE2_VER=10.45
6767

6868
services:

‎t/014-bugs.t‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,9 +1274,9 @@ worker_shutdown_timeout 1;
12741274
--- config
12751275
location /t {
12761276
content_by_lua_block {
1277-
local function thread_func()
1277+
local function thread_func(port)
12781278
local sock = ngx.socket.tcp()
1279-
local ok, err = sock:connect("127.0.0.1", 65110)
1279+
local ok, err = sock:connect("127.0.0.1", port)
12801280
local bytes, err = sock:send("hello")
12811281
if bytes ~= 5 then
12821282
sock:close()
@@ -1293,11 +1293,11 @@ location /t {
12931293
ngx.log(ngx.ERR, "successfully read a line: ", line)
12941294
end
12951295
1296-
local function timer_func()
1297-
ngx.thread.spawn(thread_func)
1296+
local function timer_func(port)
1297+
ngx.thread.spawn(thread_func, port)
12981298
end
12991299
1300-
ngx.timer.at(1, timer_func)
1300+
ngx.timer.at(1, timer_func, ngx.var.server_port)
13011301
ngx.say("Hello world")
13021302
}
13031303
}
@@ -1311,7 +1311,7 @@ my $expr;
13111311
if ($ENV{TEST_NGINX_USE_HTTP3}) {
13121312
$expr = qr|lua close the global Lua VM|
13131313
} else {
1314-
$expr = qr|failed to read a line: closed|
1314+
$expr = qr/failed to read a line: closed|attempt to send data on a closed socket/
13151315
}
13161316
13171317
$expr;

‎util/build-with-dd.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ time ngx-build $force $version \
1616
--with-threads \
1717
--with-pcre-jit \
1818
--with-ipv6 \
19-
--with-cc-opt="-DNGX_LUA_USE_ASSERT -I$PCRE_INC -I$OPENSSL_INC -DDDEBUG=1" \
19+
--with-cc-opt="-DNGX_LUA_USE_ASSERT -I$PCRE2_INC -I$OPENSSL_INC -DDDEBUG=1" \
2020
--with-http_v2_module \
2121
--with-http_v3_module \
2222
--with-http_realip_module \
2323
--with-http_ssl_module \
2424
--add-module=$root/../ndk-nginx-module \
2525
--add-module=$root/../set-misc-nginx-module \
26-
--with-ld-opt="-L$PCRE_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE_LIB:$LIBDRIZZLE_LIB:$OPENSSL_LIB" \
26+
--with-ld-opt="-L$PCRE2_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE2_LIB:$LIBDRIZZLE_LIB:$OPENSSL_LIB" \
2727
--without-mail_pop3_module \
2828
--without-mail_imap_module \
2929
--with-http_image_filter_module \

‎util/build-without-ssl.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ time ngx-build $force $version \
1717
--with-threads \
1818
--with-pcre-jit \
1919
--with-ipv6 \
20-
--with-cc-opt="-DNGX_LUA_USE_ASSERT -I$PCRE_INC" \
20+
--with-cc-opt="-DNGX_LUA_USE_ASSERT -I$PCRE2_INC" \
2121
--with-http_v2_module \
2222
--with-http_realip_module \
2323
--add-module=$root/../ndk-nginx-module \
2424
--add-module=$root/../set-misc-nginx-module \
25-
--with-ld-opt="-L$PCRE_LIB -Wl,-rpath,$PCRE_LIB:$LIBDRIZZLE_LIB" \
25+
--with-ld-opt="-L$PCRE2_LIB -Wl,-rpath,$PCRE2_LIB:$LIBDRIZZLE_LIB" \
2626
--without-mail_pop3_module \
2727
--without-mail_imap_module \
2828
--with-http_image_filter_module \

‎util/build.sh‎

Lines changed: 38 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -24,53 +24,47 @@ force=$2
2424

2525
add_fake_shm_module="--add-module=$root/t/data/fake-shm-module"
2626

27-
add_http3_module=--with-http_v3_module
28-
answer=`$root/util/ver-ge "$version" 1.25.1`
29-
if [ "$OPENSSL_VER" = "1.1.0l" ] || [ "$answer" = "N" ]; then
30-
add_http3_module=""
31-
fi
32-
3327
answer=`$root/util/ver-ge "$version" 1.25.1`
3428

3529
time ngx-build $force $version \
36-
--with-threads \
37-
--with-pcre-jit \
38-
--with-ipv6 \
39-
--with-cc-opt="-DNGX_LUA_USE_ASSERT -I$PCRE_INC -I$OPENSSL_INC" \
40-
--with-http_v2_module \
41-
$add_http3_module \
42-
--with-http_realip_module \
43-
--with-http_ssl_module \
44-
--add-module=$root/../ndk-nginx-module \
45-
--add-module=$root/../set-misc-nginx-module \
46-
--with-ld-opt="-L$PCRE_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE_LIB:$LIBDRIZZLE_LIB:$OPENSSL_LIB" \
47-
--without-mail_pop3_module \
48-
--without-mail_imap_module \
49-
--with-http_image_filter_module \
50-
--without-mail_smtp_module \
51-
--with-stream \
52-
--with-stream_ssl_module \
53-
--without-http_upstream_ip_hash_module \
54-
--without-http_memcached_module \
55-
--without-http_auth_basic_module \
56-
--without-http_userid_module \
57-
--with-http_auth_request_module \
58-
--add-module=$root/../echo-nginx-module \
59-
--add-module=$root/../memc-nginx-module \
60-
--add-module=$root/../srcache-nginx-module \
61-
--add-module=$root \
62-
--add-module=$root/../lua-upstream-nginx-module \
63-
--add-module=$root/../headers-more-nginx-module \
64-
--add-module=$root/../drizzle-nginx-module \
65-
--add-module=$root/../rds-json-nginx-module \
66-
--add-module=$root/../coolkit-nginx-module \
67-
--add-module=$root/../redis2-nginx-module \
68-
--add-module=$root/../stream-lua-nginx-module \
69-
--add-module=$root/t/data/fake-module \
70-
$add_fake_shm_module \
71-
--add-module=$root/t/data/fake-delayed-load-module \
72-
--with-http_gunzip_module \
73-
--with-http_dav_module \
30+
--with-threads \
31+
--with-pcre-jit \
32+
--with-ipv6 \
33+
--with-cc-opt="-DNGX_LUA_USE_ASSERT -I$PCRE2_INC -I$OPENSSL_INC" \
34+
--with-http_v2_module \
35+
--with-http_v3_module \
36+
--with-http_realip_module \
37+
--with-http_ssl_module \
38+
--add-module=$root/../ndk-nginx-module \
39+
--add-module=$root/../set-misc-nginx-module \
40+
--with-ld-opt="-L$PCRE2_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE2_LIB:$LIBDRIZZLE_LIB:$OPENSSL_LIB" \
41+
--without-mail_pop3_module \
42+
--without-mail_imap_module \
43+
--with-http_image_filter_module \
44+
--without-mail_smtp_module \
45+
--with-stream \
46+
--with-stream_ssl_module \
47+
--without-http_upstream_ip_hash_module \
48+
--without-http_memcached_module \
49+
--without-http_auth_basic_module \
50+
--without-http_userid_module \
51+
--with-http_auth_request_module \
52+
--add-module=$root/../echo-nginx-module \
53+
--add-module=$root/../memc-nginx-module \
54+
--add-module=$root/../srcache-nginx-module \
55+
--add-module=$root \
56+
--add-module=$root/../lua-upstream-nginx-module \
57+
--add-module=$root/../headers-more-nginx-module \
58+
--add-module=$root/../drizzle-nginx-module \
59+
--add-module=$root/../rds-json-nginx-module \
60+
--add-module=$root/../coolkit-nginx-module \
61+
--add-module=$root/../redis2-nginx-module \
62+
--add-module=$root/../stream-lua-nginx-module \
63+
--add-module=$root/t/data/fake-module \
64+
$add_fake_shm_module \
65+
--add-module=$root/t/data/fake-delayed-load-module \
66+
--with-http_gunzip_module \
67+
--with-http_dav_module \
7468
--with-select_module \
7569
--with-poll_module \
7670
$opts \

0 commit comments

Comments
 (0)