Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  increase wait time in timeout_variation_9.phpt by 1 second
This commit is contained in:
Joe Watkins 2017-02-03 06:00:53 +00:00
commit e9209e15a2
No known key found for this signature in database
GPG key ID: F9BA0ADA31CBD89E

View file

@ -14,7 +14,7 @@ set_time_limit($t);
function f()
{
echo "call";
busy_wait(4);
busy_wait(5);
}
register_shutdown_function("f");