php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use long conversion for stream context keepalive int values (#20805)

Browse Source 
This is consistent with http and ssl wrappers where int values
are converted in this way.
This commit is contained in:
Jakub Zelenka
2025-12-30 22:08:35 +01:00
committed by GitHub
parent 0578279fed
commit ab5c2a826a
3 changed files with 161 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/openssl/xp_ssl.c
View File

@@ -2231,9 +2231,9 @@ static inline int php_openssl_tcp_sockop_accept(php_stream *stream, php_openssl_
sockvals.tcp_nodelay = 1;
}
tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_keepidle");
if (tmpzval != NULL && Z_TYPE_P(tmpzval) == IS_LONG) {
if (tmpzval != NULL) {
sockvals.mask |= PHP_SOCKVAL_TCP_KEEPIDLE;
sockvals.keepalive.keepidle = Z_LVAL_P(tmpzval);
sockvals.keepalive.keepidle = (int)zval_get_long(tmpzval);
}
}

151
ext/standard/tests/network/so_keepalive_string.phpt Normal file
View File

@@ -0,0 +1,151 @@
--TEST--
stream_socket_server() and stream_socket_client() keepalive option test with string values
--EXTENSIONS--
sockets
--SKIPIF--
<?php
if (!defined('TCP_KEEPIDLE') && !defined('TCP_KEEPALIVE')) {
die('skip TCP_KEEPIDLE/TCP_KEEPALIVE not available');
}
if (!defined('TCP_KEEPINTVL')) {
die('skip TCP_KEEPINTVL not available');
}
if (!defined('TCP_KEEPCNT')) {
die('skip TCP_KEEPCNT not available');
}
?>
--FILE--
<?php
// Test server with SO_KEEPALIVE enabled
$server_context = stream_context_create([
'socket' => [
'so_keepalive' => true,
'tcp_keepidle' => '80',
'tcp_keepintvl' => '12',
'tcp_keepcnt' => '6',
]
]);
$server = stream_socket_server("tcp://127.0.0.1:0", $errno, $errstr,
STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $server_context);
if (!$server) {
die('Unable to create server');
}
$addr = stream_socket_get_name($server, false);
$port = (int)substr(strrchr($addr, ':'), 1);
// Test client with SO_KEEPALIVE enabled
$client_context = stream_context_create([
'socket' => [
'so_keepalive' => true,
'tcp_keepidle' => '31',
'tcp_keepintvl' => '6',
'tcp_keepcnt' => '4',
]
]);
$client = stream_socket_client("tcp://127.0.0.1:$port", $errno, $errstr, 30,
STREAM_CLIENT_CONNECT, $client_context);
if (!$client) {
die('Unable to create client');
}
$accepted = stream_socket_accept($server, 1);
if (!$accepted) {
die('Unable to accept connection');
}
// Verify server side (accepted connection)
$server_sock = socket_import_stream($accepted);
$server_keepalive = socket_get_option($server_sock, SOL_SOCKET, SO_KEEPALIVE);
echo "Server SO_KEEPALIVE: " . ($server_keepalive ? "enabled" : "disabled") . "\n";
if (defined('TCP_KEEPIDLE')) {
$server_idle = socket_get_option($server_sock, SOL_TCP, TCP_KEEPIDLE);
echo "Server TCP_KEEPIDLE: $server_idle\n";
} else {
$server_idle = socket_get_option($server_sock, SOL_TCP, TCP_KEEPALIVE);
echo "Server TCP_KEEPIDLE: $server_idle\n";
}
$server_intvl = socket_get_option($server_sock, SOL_TCP, TCP_KEEPINTVL);
echo "Server TCP_KEEPINTVL: $server_intvl\n";
$server_cnt = socket_get_option($server_sock, SOL_TCP, TCP_KEEPCNT);
echo "Server TCP_KEEPCNT: $server_cnt\n";
// Verify client side
$client_sock = socket_import_stream($client);
$client_keepalive = socket_get_option($client_sock, SOL_SOCKET, SO_KEEPALIVE);
echo "Client SO_KEEPALIVE: " . ($client_keepalive ? "enabled" : "disabled") . "\n";
if (defined('TCP_KEEPIDLE')) {
$client_idle = socket_get_option($client_sock, SOL_TCP, TCP_KEEPIDLE);
echo "Client TCP_KEEPIDLE: $client_idle\n";
} else {
$client_idle = socket_get_option($client_sock, SOL_TCP, TCP_KEEPALIVE);
echo "Client TCP_KEEPIDLE: $client_idle\n";
}
$client_intvl = socket_get_option($client_sock, SOL_TCP, TCP_KEEPINTVL);
echo "Client TCP_KEEPINTVL: $client_intvl\n";
$client_cnt = socket_get_option($client_sock, SOL_TCP, TCP_KEEPCNT);
echo "Client TCP_KEEPCNT: $client_cnt\n";
fclose($accepted);
fclose($client);
fclose($server);
// Test server with SO_KEEPALIVE disabled
$server2_context = stream_context_create(['socket' => ['so_keepalive' => false]]);
$server2 = stream_socket_server("tcp://127.0.0.1:0", $errno, $errstr,
STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $server2_context);
$addr2 = stream_socket_get_name($server2, false);
$port2 = (int)substr(strrchr($addr2, ':'), 1);
$client2 = stream_socket_client("tcp://127.0.0.1:$port2");
$accepted2 = stream_socket_accept($server2, 1);
$server2_sock = socket_import_stream($accepted2);
$server2_keepalive = socket_get_option($server2_sock, SOL_SOCKET, SO_KEEPALIVE);
echo "Server disabled SO_KEEPALIVE: " . ($server2_keepalive ? "enabled" : "disabled") . "\n";
fclose($accepted2);
fclose($client2);
fclose($server2);
// Test client with SO_KEEPALIVE disabled
$server3 = stream_socket_server("tcp://127.0.0.1:0", $errno, $errstr,
STREAM_SERVER_BIND | STREAM_SERVER_LISTEN);
$addr3 = stream_socket_get_name($server3, false);
$port3 = (int)substr(strrchr($addr3, ':'), 1);
$client3_context = stream_context_create(['socket' => ['so_keepalive' => false]]);
$client3 = stream_socket_client("tcp://127.0.0.1:$port3", $errno, $errstr, 30,
STREAM_CLIENT_CONNECT, $client3_context);
$client3_sock = socket_import_stream($client3);
$client3_keepalive = socket_get_option($client3_sock, SOL_SOCKET, SO_KEEPALIVE);
echo "Client disabled SO_KEEPALIVE: " . ($client3_keepalive ? "enabled" : "disabled") . "\n";
fclose($client3);
fclose($server3);
?>
--EXPECT--
Server SO_KEEPALIVE: enabled
Server TCP_KEEPIDLE: 80
Server TCP_KEEPINTVL: 12
Server TCP_KEEPCNT: 6
Client SO_KEEPALIVE: enabled
Client TCP_KEEPIDLE: 31
Client TCP_KEEPINTVL: 6
Client TCP_KEEPCNT: 4
Server disabled SO_KEEPALIVE: disabled
Client disabled SO_KEEPALIVE: disabled

22
main/streams/xp_socket.c
View File

@@ -764,30 +764,27 @@ static inline int php_tcp_sockop_bind(php_stream *stream, php_netstream_data_t *
#if defined(TCP_KEEPIDLE) || defined(TCP_KEEPALIVE)
if (PHP_STREAM_CONTEXT(stream)
&& (tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_keepidle")) != NULL
&& Z_TYPE_P(tmpzval) == IS_LONG
) {
sockvals.mask |= PHP_SOCKVAL_TCP_KEEPIDLE;
sockvals.keepalive.keepidle = (int)Z_LVAL_P(tmpzval);
sockvals.keepalive.keepidle = (int)zval_get_long(tmpzval);
}
#endif
#ifdef TCP_KEEPINTVL
if (PHP_STREAM_CONTEXT(stream)
&& (tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_keepintvl")) != NULL
&& Z_TYPE_P(tmpzval) == IS_LONG
) {
sockvals.mask |= PHP_SOCKVAL_TCP_KEEPINTVL;
sockvals.keepalive.keepintvl = (int)Z_LVAL_P(tmpzval);
sockvals.keepalive.keepintvl = (int)zval_get_long(tmpzval);
}
#endif
#ifdef TCP_KEEPCNT
if (PHP_STREAM_CONTEXT(stream)
&& (tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_keepcnt")) != NULL
&& Z_TYPE_P(tmpzval) == IS_LONG
) {
sockvals.mask |= PHP_SOCKVAL_TCP_KEEPCNT;
sockvals.keepalive.keepcnt = (int)Z_LVAL_P(tmpzval);
sockvals.keepalive.keepcnt = (int)zval_get_long(tmpzval);
}
#endif
}
@@ -895,30 +892,27 @@ static inline int php_tcp_sockop_connect(php_stream *stream, php_netstream_data_
#if defined(TCP_KEEPIDLE) || defined(TCP_KEEPALIVE)
if (PHP_STREAM_CONTEXT(stream)
&& (tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_keepidle")) != NULL
&& Z_TYPE_P(tmpzval) == IS_LONG
) {
sockvals.mask |= PHP_SOCKVAL_TCP_KEEPIDLE;
sockvals.keepalive.keepidle = (int)Z_LVAL_P(tmpzval);
sockvals.keepalive.keepidle = (int)zval_get_long(tmpzval);
}
#endif
#ifdef TCP_KEEPINTVL
if (PHP_STREAM_CONTEXT(stream)
&& (tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_keepintvl")) != NULL
&& Z_TYPE_P(tmpzval) == IS_LONG
) {
sockvals.mask |= PHP_SOCKVAL_TCP_KEEPINTVL;
sockvals.keepalive.keepintvl = (int)Z_LVAL_P(tmpzval);
sockvals.keepalive.keepintvl = (int)zval_get_long(tmpzval);
}
#endif
#ifdef TCP_KEEPCNT
if (PHP_STREAM_CONTEXT(stream)
&& (tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_keepcnt")) != NULL
&& Z_TYPE_P(tmpzval) == IS_LONG
) {
sockvals.mask |= PHP_SOCKVAL_TCP_KEEPCNT;
sockvals.keepalive.keepcnt = (int)Z_LVAL_P(tmpzval);
sockvals.keepalive.keepcnt = (int)zval_get_long(tmpzval);
}
#endif
}
@@ -976,9 +970,9 @@ static inline int php_tcp_sockop_accept(php_stream *stream, php_netstream_data_t
sockvals.tcp_nodelay = 1;
}
tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_keepidle");
if (tmpzval != NULL && Z_TYPE_P(tmpzval) == IS_LONG) {
if (tmpzval != NULL) {
sockvals.mask |= PHP_SOCKVAL_TCP_KEEPIDLE;
sockvals.keepalive.keepidle = Z_LVAL_P(tmpzval);
sockvals.keepalive.keepidle = (int)zval_get_long(tmpzval);
}
}