Commit 7ca31e3
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
1 file changed
Lines changed: 9 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -99,8 +99,8 @@ function Test1() { | |||
| 99 | 99 | client: {ALPN: 'b', NPN: undefined}}); | |
| 100 | 100 | // nothing is selected by ALPN | |
| 101 | 101 | 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}}); | ||
| 104 | 104 | // execute next test | |
| 105 | 105 | Test2(); | |
| 106 | 106 | }); | |
@@ -132,8 +132,8 @@ function Test2() { | |||
| 132 | 132 | client: {ALPN: 'b', NPN: undefined}}); | |
| 133 | 133 | // nothing is selected by ALPN | |
| 134 | 134 | 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}}); | ||
| 137 | 137 | // execute next test | |
| 138 | 138 | Test3(); | |
| 139 | 139 | }); | |
@@ -224,8 +224,9 @@ function Test5() { | |||
| 224 | 224 | checkResults(results[1], {server: {ALPN: 'b', NPN: false}, | |
| 225 | 225 | client: {ALPN: 'b', NPN: undefined}}); | |
| 226 | 226 | // 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}}); | ||
| 229 | 230 | // execute next test | |
| 230 | 231 | Test6(); | |
| 231 | 232 | }); | |
@@ -253,8 +254,8 @@ function Test6() { | |||
| 253 | 254 | checkResults(results[1], {server: {ALPN: 'b', NPN: false}, | |
| 254 | 255 | client: {ALPN: 'b', NPN: undefined}}); | |
| 255 | 256 | // 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}}); | ||
| 258 | 259 | // execute next test | |
| 259 | 260 | Test7(); | |
| 260 | 261 | }); | |
0 commit comments