Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix port clash in socket tests
This commit is contained in:
Nikita Popov 2021-08-12 12:02:27 +02:00
commit 77c1c42c66
2 changed files with 4 additions and 4 deletions

View file

@ -9,11 +9,11 @@ if (!extension_loaded('sockets')) {
--FILE--
<?php
$socket = socket_create_listen(31339);
$socket = socket_create_listen(0);
var_dump(socket_set_block($socket));
socket_close($socket);
$socket2 = socket_create_listen(31340);
$socket2 = socket_create_listen(0);
socket_close($socket2);
try {
var_dump(socket_set_block($socket2));

View file

@ -9,11 +9,11 @@ if (!extension_loaded('sockets')) {
--FILE--
<?php
$socket = socket_create_listen(31339);
$socket = socket_create_listen(0);
var_dump(socket_set_nonblock($socket));
socket_close($socket);
$socket2 = socket_create_listen(31340);
$socket2 = socket_create_listen(0);
socket_close($socket2);
try {
var_dump(socket_set_nonblock($socket2));