com php-src: Fix #79923: fix socket_set_option_bindtodevi ce test: ext/sockets/multicast.c ext/sockets/sendrecv msg.c
ext/sockets/tests/socket_set_option_bindtodevic e.phpt ext/sockets/tests/socket_set_option_error_so cket_option.phpt
| From: | Nikita Popov | Date: | Mon, 03 Aug 2020 13:03:07 +0000 |
| Subject: | com php-src: Fix #79923: fix socket_set_option_bindtodevi ce test: ext/sockets/multicast.c ext/sockets/sendrecv msg.c ext/sockets/tests/socket_set_option_bindtodevic e.phpt ext/sockets/tests/socket_set_option_error_so cket_option.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-112517@lists.php.net to get a copy of this message | ||
Commit: 65713aadddaaca1b08ab6102890406f48c75475d
Author: Santiago M.. Mola <santi@mola.io> Sat, 1 Aug 2020 18:26:57 +0200
Committer: Nikita Popov <nikita.ppv@gmail.com> Mon, 3 Aug 2020 15:03:07 +0200
Parents: 501db98e5736af3997b543f9735bb6bb0b2c70fa
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=65713aadddaaca1b08ab6102890406f48c75475d
Log:
Fix #79923: fix socket_set_option_bindtodevice test
Closes GH-5924.
Bugs:
https://bugs.php..net/79923
Changed paths:
M ext/sockets/multicast.c
M ext/sockets/sendrecvmsg.c
M ext/sockets/tests/socket_set_option_bindtodevice..phpt
M ext/sockets/tests/socket_set_option_error_socket_option.phpt
Diff:
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')) {