Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 7ca31e3

Browse filesBrowse files
Shigeki OhtsuMylesBorins
Shigeki Ohtsu
authored and
MylesBorins
committed
test: fix alpn tests for openssl1.0.2h
cherry-pick 65030c7 from v6-staging. openssl/openssl@af2db04 changed some ALPN behaviors. The tests when ALPN has no selection should be fixed because openssl was changed NPN callback to be invoked in this case. Fixes: #6458 PR-URL: #6550 Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
1 parent ef547f3 commit 7ca31e3
Copy full SHA for 7ca31e3

File tree

Expand file treeCollapse file tree

1 file changed

+9
-8
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+9
-8
lines changed
Open diff view settings
Collapse file

‎test/parallel/test-tls-alpn-server-client.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-tls-alpn-server-client.js
+9-8Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ function Test1() {
9999
client: {ALPN: 'b', NPN: undefined}});
100100
// nothing is selected by ALPN
101101
checkResults(results[2],
102-
{server: {ALPN: false, NPN: false},
103-
client: {ALPN: false, NPN: undefined}});
102+
{server: {ALPN: false, NPN: 'first-priority-unsupported'},
103+
client: {ALPN: false, NPN: false}});
104104
// execute next test
105105
Test2();
106106
});
@@ -132,8 +132,8 @@ function Test2() {
132132
client: {ALPN: 'b', NPN: undefined}});
133133
// nothing is selected by ALPN
134134
checkResults(results[2],
135-
{server: {ALPN: false, NPN: false},
136-
client: {ALPN: false, NPN: undefined}});
135+
{server: {ALPN: false, NPN: 'http/1.1'},
136+
client: {ALPN: false, NPN: false}});
137137
// execute next test
138138
Test3();
139139
});
@@ -224,8 +224,9 @@ function Test5() {
224224
checkResults(results[1], {server: {ALPN: 'b', NPN: false},
225225
client: {ALPN: 'b', NPN: undefined}});
226226
// nothing is selected by ALPN
227-
checkResults(results[2], {server: {ALPN: false, NPN: false},
228-
client: {ALPN: false, NPN: undefined}});
227+
checkResults(results[2], {server: {ALPN: false,
228+
NPN: 'first-priority-unsupported'},
229+
client: {ALPN: false, NPN: false}});
229230
// execute next test
230231
Test6();
231232
});
@@ -253,8 +254,8 @@ function Test6() {
253254
checkResults(results[1], {server: {ALPN: 'b', NPN: false},
254255
client: {ALPN: 'b', NPN: undefined}});
255256
// nothing is selected by ALPN
256-
checkResults(results[2], {server: {ALPN: false, NPN: false},
257-
client: {ALPN: false, NPN: undefined}});
257+
checkResults(results[2], {server: {ALPN: false, NPN: 'http/1.1'},
258+
client: {ALPN: false, NPN: false}});
258259
// execute next test
259260
Test7();
260261
});

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.