Skip to content

Commit 65713aa

Browse files
smolanikic
authored andcommitted
Fix #79923: fix socket_set_option_bindtodevice test
Closes GH-5924.
1 parent 501db98 commit 65713aa

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

ext/sockets/multicast.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ mcast_req_fun: ;
225225

226226
if (retval != 0) {
227227
if (retval != -2) { /* error, but message already emitted */
228-
PHP_SOCKET_ERROR(php_sock, "unable to set socket option", errno);
228+
PHP_SOCKET_ERROR(php_sock, "Unable to set socket option", errno);
229229
}
230230
return FAILURE;
231231
}
@@ -294,7 +294,7 @@ int php_do_setsockopt_ip_mcast(php_socket *php_sock,
294294
dosockopt:
295295
retval = setsockopt(php_sock->bsd_socket, level, optname, opt_ptr, optlen);
296296
if (retval != 0) {
297-
PHP_SOCKET_ERROR(php_sock, "unable to set socket option", errno);
297+
PHP_SOCKET_ERROR(php_sock, "Unable to set socket option", errno);
298298
return FAILURE;
299299
}
300300

@@ -358,7 +358,7 @@ int php_do_setsockopt_ipv6_mcast(php_socket *php_sock,
358358
dosockopt:
359359
retval = setsockopt(php_sock->bsd_socket, level, optname, opt_ptr, optlen);
360360
if (retval != 0) {
361-
PHP_SOCKET_ERROR(php_sock, "unable to set socket option", errno);
361+
PHP_SOCKET_ERROR(php_sock, "Unable to set socket option", errno);
362362
return FAILURE;
363363
}
364364

ext/sockets/sendrecvmsg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ int php_do_setsockopt_ipv6_rfc3542(php_socket *php_sock, int level, int optname,
361361
dosockopt:
362362
retval = setsockopt(php_sock->bsd_socket, level, optname, opt_ptr, optlen);
363363
if (retval != 0) {
364-
PHP_SOCKET_ERROR(php_sock, "unable to set socket option", errno);
364+
PHP_SOCKET_ERROR(php_sock, "Unable to set socket option", errno);
365365
}
366366
allocations_dispose(&allocations);
367367

ext/sockets/tests/socket_set_option_bindtodevice.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ socket_close($socket);
3333
--EXPECTF--
3434
bool(true)
3535

36-
Warning: socket_set_option(): unable to set socket option [19]: No such device in %s on line %d
36+
Warning: socket_set_option(): Unable to set socket option [19]: No such device in %s on line %d
3737
bool(false)
3838
--CREDITS--
3939
Damjan Cvetko, foreach.org

ext/sockets/tests/socket_set_option_error_socket_option.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Test if socket_set_option() returns 'unable to set socket option' failure for invalid options
2+
Test if socket_set_option() returns 'Unable to set socket option' failure for invalid options
33
--SKIPIF--
44
<?php
55
if (!extension_loaded('sockets')) {

0 commit comments

Comments
 (0)