diff options
| author | Anatol Belski <ab@php.net> | 2017-07-12 14:49:58 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-07-12 14:49:58 +0200 |
| commit | 8b04e89ef0100932a451870b84666a36fa2fa43f (patch) | |
| tree | bbcb2ff0b9dc84b278b5901547fd2f734875ad5f | |
| parent | 82acb58d8a1d2d4bf3833797833f2d3dff720e2c (diff) | |
| parent | 04cc2f6473e8439929ba8448f038058d5e20ba86 (diff) | |
| download | php-git-8b04e89ef0100932a451870b84666a36fa2fa43f.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
increase poll timeout as false positives mitigation
| -rw-r--r-- | ext/mysqli/tests/mysqli_reap_async_query.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqli/tests/mysqli_reap_async_query.phpt b/ext/mysqli/tests/mysqli_reap_async_query.phpt index e3858e6172..3f3bce3292 100644 --- a/ext/mysqli/tests/mysqli_reap_async_query.phpt +++ b/ext/mysqli/tests/mysqli_reap_async_query.phpt @@ -38,7 +38,7 @@ if (!$IS_MYSQLND) function poll_async($offset, $link, $links, $errors, $reject, $exp_ready, $use_oo_syntax) { - if ($exp_ready !== ($tmp = mysqli_poll($links, $errors, $reject, 0, 1000))) + if ($exp_ready !== ($tmp = mysqli_poll($links, $errors, $reject, 0, 2000))) printf("[%03d + 1] There should be %d links ready to read from, %d ready\n", $offset, $exp_ready, $tmp); |