Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 12, 2024
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ext/sockets/sockets.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
Loading