Fix #79923: fix socket_set_option_bindtodevice test

Closes GH-5924.
php · Aug 3, 2020 · 65713aa · 65713aa
1 parent 501db98
commit 65713aa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git 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 @@ 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;
 	}
 
@@ -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;
 	}
 

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