Skip to content

Commit 3263c83

Browse files
committed
Rename session_context_id to session_id_context in all tests
1 parent 1a33d51 commit 3263c83

5 files changed

+7
-7
lines changed

ext/openssl/tests/session_resumption_get_cb_no_ticket.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $serverCode = <<<'CODE'
1616
/* Trying to enable tickets with external cache - should warn */
1717
$ctx = stream_context_create(['ssl' => [
1818
'local_cert' => '%s',
19-
'session_context_id' => 'test-app',
19+
'session_id_context' => 'test-app',
2020
'no_ticket' => false, // Explicitly trying to enable tickets
2121
'session_new_cb' => function($stream, $sessionId, $sessionData) {
2222
// Store session

ext/openssl/tests/session_resumption_get_cb_num_tickets_zero.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ $serverCode = <<<'CODE'
1717
$flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
1818
$ctx = stream_context_create(['ssl' => [
1919
'local_cert' => '%s',
20-
'session_context_id' => 'test-no-tickets',
20+
'session_id_context' => 'test-no-tickets',
2121
'num_tickets' => 0, // Disable ticket issuance
2222
'session_new_cb' => function($stream, $sessionId, $sessionData) use (&$sessionStore, &$newCbCalled) {
2323
$key = bin2hex($sessionId);

ext/openssl/tests/session_resumption_new_cb_no_context.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
TLS session resumption - warning when session_new_cb without session_context_id and verify_peer enabled
2+
TLS session resumption - warning when session_new_cb without session_id_context and verify_peer enabled
33
--EXTENSIONS--
44
openssl
55
--SKIPIF--
@@ -14,15 +14,15 @@ $caCertFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_no_context_ca.pem.tmp';
1414
$serverCode = <<<'CODE'
1515
$flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
1616
17-
/* session_new_cb without session_context_id, with verify_peer - should warn */
17+
/* session_new_cb without session_id_context, with verify_peer - should warn */
1818
$ctx = stream_context_create(['ssl' => [
1919
'local_cert' => '%s',
2020
'verify_peer' => true,
2121
'cafile' => '%s',
2222
'session_new_cb' => function($stream, $sessionId, $sessionData) {
2323
echo "Callback might not be called\n";
2424
}
25-
/* Missing: 'session_context_id' => 'myapp' */
25+
/* Missing: 'session_id_context' => 'myapp' */
2626
]]);
2727
2828
$server = @stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);

ext/openssl/tests/session_resumption_server_external_with_context_id.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $serverCode = <<<'CODE'
1818
$flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
1919
$ctx = stream_context_create(['ssl' => [
2020
'local_cert' => '%s',
21-
'session_context_id' => 'test-server', // Proper configuration
21+
'session_id_context' => 'test-server', // Proper configuration
2222
'session_new_cb' => function($stream, $sessionId, $sessionData) use (&$sessionStore, &$newCbCalled) {
2323
$key = bin2hex($sessionId);
2424
$sessionStore[$key] = $sessionData;

ext/openssl/tests/session_resumption_server_external_with_context_id_tls12.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $serverCode = <<<'CODE'
1818
$flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
1919
$ctx = stream_context_create(['ssl' => [
2020
'local_cert' => '%s',
21-
'session_context_id' => 'test-server', // Proper configuration
21+
'session_id_context' => 'test-server', // Proper configuration
2222
'session_new_cb' => function($stream, $sessionId, $sessionData) use (&$sessionStore, &$newCbCalled) {
2323
$key = bin2hex($sessionId);
2424
$sessionStore[$key] = $sessionData;

0 commit comments

Comments
 (0)