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

Fix #79923: fix socket_set_option_bindtodevice test

Browse Source 
Closes GH-5924.
This commit is contained in:
Santiago M. Mola
2020-08-01 18:26:57 +02:00
committed by Nikita Popov
parent 501db98e57
commit 65713aaddd
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/sockets/multicast.c
View File

@@ -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;
}
@@ -294,7 +294,7 @@ ipv4_loop_ttl:
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;
}
@@ -358,7 +358,7 @@ ipv6_loop_hops:
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;
}

2
ext/sockets/sendrecvmsg.c
View File

@@ -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);

2
ext/sockets/tests/socket_set_option_bindtodevice.phpt
View File

@@ -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
ext/sockets/tests/socket_set_option_error_socket_option.phpt
View File

@@ -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')) {