Skip to content

Fix #79923: fix socket_set_option_bindtodevice test #5924

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

Closed
wants to merge 1 commit into from
Closed

Fix #79923: fix socket_set_option_bindtodevice test #5924

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions ext/sockets/multicast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ mcast_req_fun: ;

if (retval != 0) {
if (retval != -2) { /* error, but message already emitted */
PHP_SOCKET_ERROR(php_sock, "unable to set socket option", errno);
PHP_SOCKET_ERROR(php_sock, "Unable to set socket option", errno);
}
return FAILURE;
}
Expand Down Expand Up @@ -294,7 +294,7 @@ int php_do_setsockopt_ip_mcast(php_socket *php_sock,
dosockopt:
retval = setsockopt(php_sock->bsd_socket, level, optname, opt_ptr, optlen);
if (retval != 0) {
PHP_SOCKET_ERROR(php_sock, "unable to set socket option", errno);
PHP_SOCKET_ERROR(php_sock, "Unable to set socket option", errno);
return FAILURE;
}

Expand Down Expand Up @@ -358,7 +358,7 @@ int php_do_setsockopt_ipv6_mcast(php_socket *php_sock,
dosockopt:
retval = setsockopt(php_sock->bsd_socket, level, optname, opt_ptr, optlen);
if (retval != 0) {
PHP_SOCKET_ERROR(php_sock, "unable to set socket option", errno);
PHP_SOCKET_ERROR(php_sock, "Unable to set socket option", errno);
return FAILURE;
}

Expand Down
2 changes: 1 addition & 1 deletion ext/sockets/sendrecvmsg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ int php_do_setsockopt_ipv6_rfc3542(php_socket *php_sock, int level, int optname,
dosockopt:
retval = setsockopt(php_sock->bsd_socket, level, optname, opt_ptr, optlen);
if (retval != 0) {
PHP_SOCKET_ERROR(php_sock, "unable to set socket option", errno);
PHP_SOCKET_ERROR(php_sock, "Unable to set socket option", errno);
}
allocations_dispose(&allocations);

Expand Down
2 changes: 1 addition & 1 deletion ext/sockets/tests/socket_set_option_bindtodevice.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ socket_close($socket);
--EXPECTF--
bool(true)

Warning: socket_set_option(): unable to set socket option [19]: No such device in %s on line %d
Warning: socket_set_option(): Unable to set socket option [19]: No such device in %s on line %d
bool(false)
--CREDITS--
Damjan Cvetko, foreach.org
2 changes: 1 addition & 1 deletion ext/sockets/tests/socket_set_option_error_socket_option.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--TEST--
Test if socket_set_option() returns 'unable to set socket option' failure for invalid options
Test if socket_set_option() returns 'Unable to set socket option' failure for invalid options
--SKIPIF--
<?php
if (!extension_loaded('sockets')) {
Expand Down