archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/sockets: socket_get_option/socket_set_option timeout type on win32. (#17123)

Browse source 
For SO_SNDTIMEO/SO_RCVTIMEO, normally the timeout ought to be of
DWORD/unsigned long.
This commit is contained in:
David CARLIER 2024-12-12 13:12:40 +00:00 • committed by GitHub
parent 3968dbf258
commit 07cd468262
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ext/sockets/sockets.c
View file

@ -1645,7 +1645,7 @@ PHP_FUNCTION(socket_get_option)
struct linger linger_val;
struct timeval tv;
#ifdef PHP_WIN32
int timeout = 0;
DWORD timeout = 0;
#endif
socklen_t optlen;
php_socket *php_sock;
@ -1757,15 +1757,15 @@ PHP_FUNCTION(socket_get_option)
RETURN_FALSE;
}
#else
optlen = sizeof(int);
optlen = sizeof(timeout);
if (getsockopt(php_sock->bsd_socket, level, optname, (char*)&timeout, &optlen) != 0) {
PHP_SOCKET_ERROR(php_sock, "Unable to retrieve socket option", errno);
RETURN_FALSE;
}
tv.tv_sec = timeout ? timeout / 1000 : 0;
tv.tv_usec = timeout ? (timeout * 1000) % 1000000 : 0;
tv.tv_sec = timeout ? (long)(timeout / 1000) : 0;
tv.tv_usec = timeout ? (long)((timeout * 1000) % 1000000) : 0;
#endif
array_init(return_value);
@ -1874,7 +1874,7 @@ PHP_FUNCTION(socket_set_option)
php_socket *php_sock;
int ov, optlen, retval;
#ifdef PHP_WIN32
int timeout;
DWORD timeout;
#else
struct timeval tv;
#endif
@ -2019,7 +2019,7 @@ PHP_FUNCTION(socket_set_option)
opt_ptr = &tv;
#else
timeout = Z_LVAL_P(sec) * 1000 + Z_LVAL_P(usec) / 1000;
optlen = sizeof(int);
optlen = sizeof(timeout);
opt_ptr = &timeout;
#endif
break;