Skip to content

Commit fb1d4ab

Browse files
authored
travis-ci: bumped the NGINX core to 1.19.3. (#212)
1 parent 2bc104b commit fb1d4ab

File tree

4 files changed

+21
-10
lines changed

4 files changed

+21
-10
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ env:
3737
- TEST_NGINX_SLEEP=0.006
3838
matrix:
3939
- NGINX_VERSION=1.17.8 OPENSSL_VER=1.0.2u
40-
- NGINX_VERSION=1.17.8 OPENSSL_VER=1.1.0l
41-
- NGINX_VERSION=1.17.8 OPENSSL_VER=1.1.1f
40+
- NGINX_VERSION=1.19.3 OPENSSL_VER=1.0.2u
41+
- NGINX_VERSION=1.19.3 OPENSSL_VER=1.1.0l
42+
- NGINX_VERSION=1.19.3 OPENSSL_VER=1.1.1f
4243

4344
services:
4445
- memcache

t/006-escape.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ qr/\[error\] \d+#\d+: \*\d+ lua entry thread aborted: runtime error: "type" is n
147147
[alert]
148148

149149

150+
150151
=== TEST 13: escape type out of range
151152
--- stream_server_config
152153
content_by_lua_block {
@@ -159,6 +160,7 @@ qr/\[error\] \d+#\d+: \*\d+ lua entry thread aborted: runtime error: "type" -1 o
159160
[alert]
160161

161162

163+
162164
=== TEST 14: escape type error
163165
--- stream_server_config
164166
content_by_lua_block {

t/030-uri-args.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ __DATA__
2626
local t = {a = "bar", b = "foo"}
2727
ngx.say(ngx.encode_args(t))
2828
}
29-
--- stream_response
30-
a=bar&b=foo
29+
--- stream_response eval
30+
qr/a=bar&b=foo|b=foo&a=bar/
3131
--- no_error_log
3232
[error]
3333

t/129-ssl-socket.t

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ $::DSTRootCertificate"
732732

733733
--- stream_response eval
734734
qr{connected: 1
735-
failed to do SSL handshake: (22: certificate chain too long|20: unable to get local issuer certificate)
735+
failed to do SSL handshake: (22: certificate chain too long|20: unable to get local issuer certificate|21: unable to verify the first certificate)
736736
failed to send stream request: closed
737737
}
738738

@@ -741,7 +741,7 @@ failed to send stream request: closed
741741
--- grep_error_log_out
742742
--- error_log eval
743743
['lua ssl server name: "openresty.org"',
744-
qr/lua ssl certificate verify error: \((22: certificate chain too long|20: unable to get local issuer certificate)\)/]
744+
qr/lua ssl certificate verify error: \((22: certificate chain too long|20: unable to get local issuer certificate|21: unable to verify the first certificate)\)/]
745745
--- no_error_log
746746
SSL reused session
747747
[alert]
@@ -808,7 +808,7 @@ $::DSTRootCertificate"
808808

809809
--- stream_response eval
810810
qr/connected: 1
811-
failed to do SSL handshake: (22: certificate chain too long|20: unable to get local issuer certificate)
811+
failed to do SSL handshake: (22: certificate chain too long|20: unable to get local issuer certificate|21: unable to verify the first certificate)
812812
failed to send stream request: closed
813813
/
814814

@@ -1928,10 +1928,18 @@ SSL reused session
19281928
collectgarbage()
19291929
}
19301930
1931-
--- stream_response
1932-
connected: 1
1931+
--- stream_response eval
1932+
# Since nginx version 1.19.1, invalidity date is considerd a non-critical CRL
1933+
# entry extension, in other words, revoke still works even if CRL has expired.
1934+
$Test::Nginx::Util::NginxVersion >= 1.019001 ?
1935+
1936+
"connected: 1
1937+
failed to do SSL handshake: 23: certificate revoked
1938+
failed to send stream request: closed\n" :
1939+
1940+
"connected: 1
19331941
failed to do SSL handshake: 12: CRL has expired
1934-
failed to send stream request: closed
1942+
failed to send stream request: closed\n";
19351943
19361944
--- user_files eval
19371945
">>> test.key

0 commit comments

Comments
 (0)