diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-08 16:32:00 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-08 16:32:00 +0100 |
| commit | d5f26de63dd4b134b45024035de24f3ed844da12 (patch) | |
| tree | 19ce037a5aaa202961235e94f8af966a3adc885e /sapi/fpm/tests | |
| parent | c669a1a4daa61e95db9441b7259fc7ed39066147 (diff) | |
| parent | 4b860c06ed05319cd9e6cc0f8bbe93231d2b214b (diff) | |
| download | php-git-d5f26de63dd4b134b45024035de24f3ed844da12.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Revert "Display a message if select in FPM test timeouts"
Diffstat (limited to 'sapi/fpm/tests')
| -rw-r--r-- | sapi/fpm/tests/tester.inc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sapi/fpm/tests/tester.inc b/sapi/fpm/tests/tester.inc index 7d43d5e8b2..b2a387638e 100644 --- a/sapi/fpm/tests/tester.inc +++ b/sapi/fpm/tests/tester.inc @@ -622,11 +622,9 @@ class Tester $read = [$this->outDesc]; $write = null; $except = null; - $timeout = 3; - if (stream_select($read, $write, $except, $timeout)) { + if (stream_select($read, $write, $except, 3)) { return fgets($this->outDesc); } else { - $this->error("Select timeout ($timeout seconds)"); return null; } } |