Skip to content

Commit 77c1c42

Browse files
committed
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4: Fix port clash in socket tests
2 parents e8a34d6 + 78cbe56 commit 77c1c42

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ext/sockets/tests/socket_set_block-retval.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ if (!extension_loaded('sockets')) {
99
--FILE--
1010
<?php
1111

12-
$socket = socket_create_listen(31339);
12+
$socket = socket_create_listen(0);
1313
var_dump(socket_set_block($socket));
1414
socket_close($socket);
1515

16-
$socket2 = socket_create_listen(31340);
16+
$socket2 = socket_create_listen(0);
1717
socket_close($socket2);
1818
try {
1919
var_dump(socket_set_block($socket2));

ext/sockets/tests/socket_set_nonblock-retval.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ if (!extension_loaded('sockets')) {
99
--FILE--
1010
<?php
1111

12-
$socket = socket_create_listen(31339);
12+
$socket = socket_create_listen(0);
1313
var_dump(socket_set_nonblock($socket));
1414
socket_close($socket);
1515

16-
$socket2 = socket_create_listen(31340);
16+
$socket2 = socket_create_listen(0);
1717
socket_close($socket2);
1818
try {
1919
var_dump(socket_set_nonblock($socket2));

0 commit comments

Comments
 (0)