diff options
| author | Santiago M. Mola <santi@mola.io> | 2020-08-01 18:26:57 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-03 15:03:07 +0200 |
| commit | 65713aadddaaca1b08ab6102890406f48c75475d (patch) | |
| tree | 499aa4a7546cca3fbe5306b4a2f8f4d5d16737fd | |
| parent | 501db98e5736af3997b543f9735bb6bb0b2c70fa (diff) | |
| download | php-git-65713aadddaaca1b08ab6102890406f48c75475d.tar.gz | |
Fix #79923: fix socket_set_option_bindtodevice test
Closes GH-5924.
| -rw-r--r-- | ext/sockets/multicast.c | 6 | ||||
| -rw-r--r-- | ext/sockets/sendrecvmsg.c | 2 | ||||
| -rw-r--r-- | ext/sockets/tests/socket_set_option_bindtodevice.phpt | 2 | ||||
| -rw-r--r-- | ext/sockets/tests/socket_set_option_error_socket_option.phpt | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c index d7f435cd85..321efdc403 100644 --- a/ext/sockets/multicast.c +++ b/ext/sockets/multicast.c @@ -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; } diff --git a/ext/sockets/sendrecvmsg.c b/ext/sockets/sendrecvmsg.c index 32f559a192..27e3681f6a 100644 --- a/ext/sockets/sendrecvmsg.c +++ b/ext/sockets/sendrecvmsg.c @@ -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); diff --git a/ext/sockets/tests/socket_set_option_bindtodevice.phpt b/ext/sockets/tests/socket_set_option_bindtodevice.phpt index fe0afd7c51..acce4d832c 100644 --- a/ext/sockets/tests/socket_set_option_bindtodevice.phpt +++ b/ext/sockets/tests/socket_set_option_bindtodevice.phpt @@ -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 diff --git a/ext/sockets/tests/socket_set_option_error_socket_option.phpt b/ext/sockets/tests/socket_set_option_error_socket_option.phpt index d1d9c842ae..0729524f6e 100644 --- a/ext/sockets/tests/socket_set_option_error_socket_option.phpt +++ b/ext/sockets/tests/socket_set_option_error_socket_option.phpt @@ -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')) { |