Fix #79923: fix socket_set_option_bindtodevice test

Closes GH-5924.

diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c
index d7f435cd859b066b96d2f51c0edfda1bb999b190..321efdc4039bc6f5a86f61ca3f24091892e3b185 100644 (file)
--- 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 32f559a192258fba3f6aab133e6e968657f96308..27e3681f6a250bf9a884b485a8d3ffaa2b8f6af1 100644 (file)
--- 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 fe0afd7c5132441a565b33144ce4ba0487ed4091..acce4d832c4e5dee850b9746730b692661e76a3f 100644 (file)
--- 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 d1d9c842ae526063cb684e84066aa53c6c49e8f4..0729524f6e2496a43f42b2d9be5b64ba9ee88df1 100644 (file)
--- 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')) {