You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit 81d7022
Browse filesBrowse the repository at this point in the historyBrowse files
CI switched to curl 8.20.0 (static-curl 8.20.0). Several curl changes
since 8.3.0 altered the stderr messages our tests match against, so the
affected `--- curl_error` expectations need updating.
The changes map to three upstream curl commits:
* http/3: add description for known server error codes (f6e8531c03ed,
8.19.0) appends the error code and its name to the HTTP/3 stream
reset message:
"HTTP/3 stream 0 reset by server"
-> "HTTP/3 stream 0 reset by server (error 0x102 INTERNAL_ERROR)"
-> t/005-exit.t
* h2+h3: align stream close handling (0f042efcb1, 8.19.0) rewrites the
HTTP/2 stream reset message and aligns it with HTTP/3:
"HTTP/2 stream 1 was not closed cleanly" / "was reset"
-> "HTTP/2 stream 1 reset by server (error 0x2 INTERNAL_ERROR)"
(it also changed the HTTP/3 path that emits
"ngtcp2_conn_writev_stream returned error: ERR_CLOSING")
-> t/033-ctx.t, t/041-header-filter.t, t/091-coroutine.t
* ngtcp2: check error code on connect failure (115fe808f2, 8.17.0) makes
a QUIC handshake aborted by the server a permanent connect failure
(CURLE_COULDNT_CONNECT, exit 7) instead of retrying until a timeout.
The test (which deliberately fails the handshake via ngx.exit(500) in
ssl_certificate_by_lua*) now sees:
"curl: (28) Connection time-out"
-> "Failed to connect to ... port ... after N ms: Could not connect
to server"
-> t/166-ssl-client-hello.t
Copy file name to clipboardExpand all lines: t/041-header-filter.t
+22-22Lines changed: 22 additions & 22 deletions
Original file line number
Diff line number
Diff line change
@@ -125,7 +125,7 @@ GET /read
125
125
--- error_code
126
126
--- response_body
127
127
--- curl_error eval
128
-
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
128
+
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1reset by server \(error 0x2 INTERNAL_ERROR\)|curl: \(95\) HTTP\/3 stream 0 reset by server/
129
129
130
130
131
131
@@ -469,7 +469,7 @@ failed to run header_filter_by_lua*: header_filter_by_lua(nginx.conf:47):2: Some
469
469
--- no_error_log
470
470
[alert]
471
471
--- curl_error eval
472
-
qr/curl: \(56\) Failurewhen receiving data from the peer|curl: \(92\) HTTP\/2 stream 1was not closed cleanly|curl: \(28\) Remote peer returned unexpected data|curl: \(52\) Empty reply from server|curl: \(95\) HTTP\/3 stream 0 reset by server/
472
+
qr/curl: \(56\) ngtcp2_conn_writev_stream returned error: ERR_CLOSING|curl: \(92\) HTTP\/2 stream 1reset by server \(error 0x2 INTERNAL_ERROR\)|curl: \(28\) Remote peer returned unexpected data|curl: \(52\) Empty reply from server|curl: \(95\) HTTP\/3 stream 0 reset by server/
473
473
474
474
475
475
@@ -494,7 +494,7 @@ failed to run header_filter_by_lua*: unknown reason
494
494
--- no_error_log
495
495
[alert]
496
496
--- curl_error eval
497
-
qr/curl: \(56\) Failurewhen receiving data from the peer|curl: \(92\) HTTP\/2 stream 1was not closed cleanly|curl: \(28\) Remote peer returned unexpected data|curl: \(52\) Empty reply from server|curl: \(95\) HTTP\/3 stream 0 reset by server/
497
+
qr/curl: \(56\) ngtcp2_conn_writev_stream returned error: ERR_CLOSING|curl: \(92\) HTTP\/2 stream 1reset by server \(error 0x2 INTERNAL_ERROR\)|curl: \(28\) Remote peer returned unexpected data|curl: \(52\) Empty reply from server|curl: \(95\) HTTP\/3 stream 0 reset by server/
498
498
499
499
500
500
@@ -510,7 +510,7 @@ GET /lua
510
510
--- error_log
511
511
API disabled in the contextof header_filter_by_lua*
512
512
--- curl_error eval
513
-
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
513
+
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1reset by server \(error 0x2 INTERNAL_ERROR\)|curl: \(95\) HTTP\/3 stream 0 reset by server/
514
514
515
515
516
516
@@ -526,7 +526,7 @@ GET /lua
526
526
--- error_log
527
527
API disabled in the contextof header_filter_by_lua*
528
528
--- curl_error eval
529
-
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
529
+
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1reset by server \(error 0x2 INTERNAL_ERROR\)|curl: \(95\) HTTP\/3 stream 0 reset by server/
530
530
531
531
532
532
@@ -542,7 +542,7 @@ GET /lua
542
542
--- error_log
543
543
API disabled in the contextof header_filter_by_lua*
544
544
--- curl_error eval
545
-
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
545
+
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1reset by server \(error 0x2 INTERNAL_ERROR\)|curl: \(95\) HTTP\/3 stream 0 reset by server/
546
546
547
547
548
548
@@ -558,7 +558,7 @@ GET /lua
558
558
--- error_log
559
559
API disabled in the contextof header_filter_by_lua*
560
560
--- curl_error eval
561
-
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
561
+
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1reset by server \(error 0x2 INTERNAL_ERROR\)|curl: \(95\) HTTP\/3 stream 0 reset by server/
562
562
563
563
564
564
@@ -574,7 +574,7 @@ GET /lua
574
574
--- error_log
575
575
API disabled in the contextof header_filter_by_lua*
576
576
--- curl_error eval
577
-
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
577
+
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1reset by server \(error 0x2 INTERNAL_ERROR\)|curl: \(95\) HTTP\/3 stream 0 reset by server/
578
578
579
579
580
580
@@ -594,7 +594,7 @@ GET /lua
594
594
--- error_log
595
595
API disabled in the contextof header_filter_by_lua*
596
596
--- curl_error eval
597
-
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
597
+
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1reset by server \(error 0x2 INTERNAL_ERROR\)|curl: \(95\) HTTP\/3 stream 0 reset by server/
598
598
599
599
600
600
@@ -614,7 +614,7 @@ GET /lua
614
614
--- error_log
615
615
API disabled in the contextof header_filter_by_lua*
616
616
--- curl_error eval
617
-
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
617
+
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1reset by server \(error 0x2 INTERNAL_ERROR\)|curl: \(95\) HTTP\/3 stream 0 reset by server/
618
618
619
619
620
620
@@ -630,7 +630,7 @@ GET /lua
630
630
--- error_log
631
631
API disabled in the contextof header_filter_by_lua*
632
632
--- curl_error eval
633
-
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
633
+
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1reset by server \(error 0x2 INTERNAL_ERROR\)|curl: \(95\) HTTP\/3 stream 0 reset by server/
634
634
635
635
636
636
@@ -646,7 +646,7 @@ GET /lua
646
646
--- error_log
647
647
API disabled in the contextof header_filter_by_lua*
648
648
--- curl_error eval
649
-
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
649
+
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1reset by server \(error 0x2 INTERNAL_ERROR\)|curl: \(95\) HTTP\/3 stream 0 reset by server/
650
650
651
651
652
652
@@ -662,7 +662,7 @@ GET /lua
662
662
--- error_log
663
663
API disabled in the contextof header_filter_by_lua*
664
664
--- curl_error eval
665
-
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
665
+
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1reset by server \(error 0x2 INTERNAL_ERROR\)|curl: \(95\) HTTP\/3 stream 0 reset by server/
666
666
667
667
668
668
@@ -696,7 +696,7 @@ GET /lua
696
696
--- error_log eval
697
697
qr/API disabled in the contextof header_filter_by_lua\*|http3 requests are not supported without content-length header/ms
698
698
--- curl_error eval
699
-
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
699
+
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1reset by server \(error 0x2 INTERNAL_ERROR\)|curl: \(95\) HTTP\/3 stream 0 reset by server/
700
700
701
701
702
702
@@ -720,7 +720,7 @@ if (defined $ENV{TEST_NGINX_USE_HTTP3}) {
720
720
721
721
$err_log;
722
722
--- curl_error eval
723
-
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
723
+
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1reset by server \(error 0x2 INTERNAL_ERROR\)|curl: \(95\) HTTP\/3 stream 0 reset by server/
724
724
725
725
726
726
@@ -736,7 +736,7 @@ GET /lua
736
736
--- error_log
737
737
API disabled in the contextof header_filter_by_lua*
738
738
--- curl_error eval
739
-
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
739
+
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1reset by server \(error 0x2 INTERNAL_ERROR\)|curl: \(95\) HTTP\/3 stream 0 reset by server/
740
740
741
741
742
742
@@ -752,7 +752,7 @@ GET /lua
752
752
--- error_log
753
753
API disabled in the contextof header_filter_by_lua*
754
754
--- curl_error eval
755
-
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
755
+
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1reset by server \(error 0x2 INTERNAL_ERROR\)|curl: \(95\) HTTP\/3 stream 0 reset by server/
756
756
757
757
758
758
@@ -801,7 +801,7 @@ in function 'error'
801
801
in function 'bar'
802
802
in function 'foo'
803
803
--- curl_error eval
804
-
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
804
+
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1reset by server \(error 0x2 INTERNAL_ERROR\)|curl: \(95\) HTTP\/3 stream 0 reset by server/
805
805
806
806
807
807
@@ -821,7 +821,7 @@ GET /lua?a=1&b=2
821
821
--- error_log eval
822
822
qr/failed to load external Lua file ".*?test2\.lua": cannot open.*? No such file or directory/
823
823
--- curl_error eval
824
-
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
824
+
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1reset by server \(error 0x2 INTERNAL_ERROR\)|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(56\) Failure when receiving data from the peer|curl: \(56\) Failure when receiving data from the peer|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly: INTERNAL_ERROR \(err 2\)/
930
+
qr/curl: \(56\) ngtcp2_conn_writev_stream returned error: ERR_CLOSING|curl: \(56\) Failure when receiving data from the peer|curl: \(92\) HTTP\/2 stream 1 reset by server \(error 0x2 INTERNAL_ERROR\)/
Copy file name to clipboardExpand all lines: t/166-ssl-client-hello.t
+1-1Lines changed: 1 addition & 1 deletion
Original file line number
Diff line number
Diff line change
@@ -3437,7 +3437,7 @@ qr/test completed/,
3437
3437
GET /t
3438
3438
--- ignore_response
3439
3439
--- curl_error eval
3440
-
qr/Connection time/
3440
+
qr/Failed toconnectto.* port .*after.* ms: Could notconnectto server/
3441
3441
--- grep_error_log eval: qr/(client hello: cosocket test start|client hello: received memc reply: VERSION|client hello: cosocket test done|cert by: test start)/
0 commit comments