diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-09 10:20:28 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-09 10:20:28 +0100 |
| commit | 0a9bdd6e7b6545b830f2bf1c4795a74c2dc30730 (patch) | |
| tree | 8d7766a2ca071f9cc669e5322f4878ad9e0b9e40 /sapi | |
| parent | aa5a24d6fc202d326376ae780a6337ae1e00928c (diff) | |
| parent | b3cc30adf863e4558208aa60b7ad1c53c66e2119 (diff) | |
| download | php-git-0a9bdd6e7b6545b830f2bf1c4795a74c2dc30730.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Increase select timeout in FPM tester
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/fpm/tests/tester.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/fpm/tests/tester.inc b/sapi/fpm/tests/tester.inc index b2a387638e..3c452a19d5 100644 --- a/sapi/fpm/tests/tester.inc +++ b/sapi/fpm/tests/tester.inc @@ -622,7 +622,7 @@ class Tester $read = [$this->outDesc]; $write = null; $except = null; - if (stream_select($read, $write, $except, 3)) { + if (stream_select($read, $write, $except, $timeout=5)) { return fgets($this->outDesc); } else { return null; |