Skip to content

Commit 4c19890

Browse files
committed
Make the new_cb no session ID context test work on Win
1 parent d36e774 commit 4c19890

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

ext/openssl/tests/session_resumption_new_cb_no_context.phpt

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,19 @@ $serverCode = <<<'CODE'
2020
'verify_peer' => true,
2121
'cafile' => '%s',
2222
'session_new_cb' => function($stream, $session) {
23-
echo "Callback might not be called\n";
23+
echo "not called new_cb\n";
24+
},
25+
'session_get_cb' => function($stream, $sessionId) {
26+
echo "not called new_cb\n";
27+
return null;
2428
}
2529
/* Missing: 'session_id_context' => 'myapp' */
2630
]]);
2731
28-
$server = @stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
29-
phpt_notify_server_start($server);
30-
3132
try {
33+
$server = @stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
34+
phpt_notify_server_start($server);
35+
3236
$client = @stream_socket_accept($server, 30);
3337
if ($client === false) {
3438
phpt_notify(message: "SERVER_FAILED_UNEXPECTEDLY");
@@ -48,15 +52,11 @@ $clientCode = <<<'CODE'
4852
/* Try to use corrupted session data */
4953
$ctx = stream_context_create(['ssl' => [
5054
'verify_peer' => false,
51-
'verify_peer_name' => false,
55+
'verify_peer_name' => false
5256
]]);
5357
5458
$client = @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 30, $flags, $ctx);
5559
56-
if ($client === false) {
57-
echo "Connection failed as expected\n";
58-
}
59-
6060
$result = phpt_wait();
6161
echo trim($result) . "\n";
6262
CODE;
@@ -75,5 +75,4 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
7575
@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_no_context_ca.pem.tmp');
7676
?>
7777
--EXPECT--
78-
Connection failed as expected
7978
SERVER_EXCEPTION: session_id_context must be set if session_new_cb is set

0 commit comments

Comments
 (0)