Skip to content

Commit 64b2faf

Browse files
author
Johnny
authored
travis-ci: bumped the NGINX core to 1.19.2. (#315)
1 parent 1326c0a commit 64b2faf

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ env:
4141
- TEST_NGINX_RANDOMIZE=1
4242
- LUACHECK_VER=0.21.1
4343
matrix:
44-
- NGINX_VERSION=1.17.8 OPENSSL_VER=1.0.2u OPENSSL_PATCH_VER=1.0.2h
45-
- NGINX_VERSION=1.17.8 OPENSSL_VER=1.1.0l OPENSSL_PATCH_VER=1.1.0d
46-
- NGINX_VERSION=1.17.8 OPENSSL_VER=1.1.1g OPENSSL_PATCH_VER=1.1.1f
44+
- NGINX_VERSION=1.19.3 OPENSSL_VER=1.0.2u OPENSSL_PATCH_VER=1.0.2h
45+
- NGINX_VERSION=1.19.3 OPENSSL_VER=1.1.0l OPENSSL_PATCH_VER=1.1.0d
46+
- NGINX_VERSION=1.19.3 OPENSSL_VER=1.1.1g OPENSSL_PATCH_VER=1.1.1f
4747

4848
services:
4949
- memcache

t/pipe-stdout.t

+2-1
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,8 @@ lua pipe proc read stdout cleanup
746746
content_by_lua_block {
747747
local ngx_pipe = require "ngx.pipe"
748748
package.loaded.proc = ngx_pipe.spawn({"sh", "-c", "sleep 0.01 && echo hello world && exit 2"})
749-
local res1, res2 = ngx.location.capture_multi{{"/req1"}, {"/req2"}}
749+
local res1 = ngx.location.capture("/req1")
750+
local res2 = ngx.location.capture("/req2")
750751
ngx.print(res1.body)
751752
ngx.print(res2.body)
752753
}

t/request.t

+15
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ host: localhost
4949
Foo: foo
5050
Bar: bar
5151
Baz: baz
52+
--- wait: 0.2
5253
--- error_log eval
5354
qr/\[TRACE\s+\d+ .*? -> \d+\]/
5455
--- no_error_log eval
@@ -91,6 +92,7 @@ Host: localhost
9192
Foo: foo
9293
Bar: bar
9394
Baz: baz
95+
--- wait: 0.2
9496
--- error_log eval
9597
qr/\[TRACE\s+\d+ .*? -> \d+\]/
9698
--- no_error_log
@@ -128,6 +130,7 @@ Host: localhost
128130
Foo: foo
129131
Bar: bar
130132
Baz: baz
133+
--- wait: 0.2
131134
--- error_log eval
132135
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
133136
--- no_error_log
@@ -169,6 +172,7 @@ host: localhost
169172
--- more_headers
170173
Foo-Bar: foo
171174
Baz: baz
175+
--- wait: 0.2
172176
--- error_log eval
173177
qr/\[TRACE\s+\d+ .*? -> \d+\]/
174178
--- no_error_log eval
@@ -254,6 +258,7 @@ qr/\[TRACE\s+\d+ .*? -> \d+\]/
254258
--- request
255259
GET /t?
256260
--- response_body
261+
--- wait: 0.2
257262
--- error_log eval
258263
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
259264
--- no_error_log
@@ -286,6 +291,7 @@ true
286291
>= 0.099: true
287292
< 0.11: true
288293

294+
--- wait: 0.2
289295
--- error_log eval
290296
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
291297
--- no_error_log
@@ -312,6 +318,7 @@ GET /t
312318
--- response_body
313319
method: GET
314320

321+
--- wait: 0.2
315322
--- error_log eval
316323
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
317324
--- no_error_log
@@ -338,6 +345,7 @@ OPTIONS /t
338345
--- response_body
339346
method: OPTIONS
340347

348+
--- wait: 0.2
341349
--- error_log eval
342350
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
343351
--- no_error_log
@@ -366,6 +374,7 @@ hello
366374
--- response_body
367375
method: POST
368376

377+
--- wait: 0.2
369378
--- error_log eval
370379
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
371380
--- no_error_log
@@ -394,6 +403,7 @@ hello
394403
--- response_body
395404
method: BLAH
396405

406+
--- wait: 0.2
397407
--- error_log eval
398408
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
399409
--- no_error_log
@@ -422,6 +432,7 @@ hello
422432
--- response_body
423433
method: CONNECT
424434

435+
--- wait: 0.2
425436
--- error_log eval
426437
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
427438
--- no_error_log
@@ -448,6 +459,7 @@ GET /t
448459
--- response_body
449460
method: PUT
450461

462+
--- wait: 0.2
451463
--- error_log eval
452464
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
453465
--- no_error_log
@@ -474,6 +486,7 @@ GET /t
474486
--- response_body
475487
header foo: 500
476488

489+
--- wait: 0.2
477490
--- error_log eval
478491
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
479492
--- no_error_log
@@ -500,6 +513,7 @@ GET /t
500513
--- response_body
501514
header foo: nil
502515

516+
--- wait: 0.2
503517
--- error_log eval
504518
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
505519
--- no_error_log
@@ -527,6 +541,7 @@ GET /t
527541
--- response_body
528542
header foo: nil
529543

544+
--- wait: 0.2
530545
--- error_log eval
531546
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
532547
--- no_error_log

0 commit comments

Comments
 (0)