Merge branch 'PHP-7.4'

nikic · nikic · commit fb8ffda690b0 · 2020-01-03T16:49:42.000+01:00
* PHP-7.4:
  Slightly increase tolerance in time_sleep_until() test
diff --git a/ext/standard/tests/misc/time_sleep_until_basic.phpt b/ext/standard/tests/misc/time_sleep_until_basic.phpt
@@ -30,7 +30,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 }
 
 // Add some tolerance for early wake on macos. Reason unknown.
-if ($now + 0.001 >= $sleepUntil) {
+if ($now + 0.002 >= $sleepUntil) {
     echo "Success\n";
 } else {
     echo "Sleep until (before truncation): ", $time, "\n";

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`// Add some tolerance for early wake on macos. Reason unknown.`
`33`		`-if ($now + 0.001 >= $sleepUntil) {`
	`33`	`+if ($now + 0.002 >= $sleepUntil) {`
`34`	`34`	`echo "Success\n";`
`35`	`35`	`} else {`
`36`	`36`	`echo "Sleep until (before truncation): ", $time, "\n";`