Skip to content

Commit c669a1a

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Display a message if select in FPM test timeouts
2 parents d0d1654 + e236149 commit c669a1a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

sapi/fpm/tests/tester.inc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,9 +622,11 @@ class Tester
622622
$read = [$this->outDesc];
623623
$write = null;
624624
$except = null;
625-
if (stream_select($read, $write, $except, 3)) {
625+
$timeout = 3;
626+
if (stream_select($read, $write, $except, $timeout)) {
626627
return fgets($this->outDesc);
627628
} else {
629+
$this->error("Select timeout ($timeout seconds)");
628630
return null;
629631
}
630632
}

0 commit comments

Comments
 (0)