summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-07-10 11:11:30 +0200
committerNikita Popov <nikita.ppv@gmail.com>2019-07-10 11:11:30 +0200
commitbbd12b3d30f4ff6694d99d63033eb31b88946211 (patch)
treed0dc45126f321d809324fc361672e597a9a4422b /sapi
parentb3438b2670fc699d37e1281ab31478f25d2d8786 (diff)
parent2bca35eaccfcded049f61f994c6c9078c6c91208 (diff)
downloadphp-git-bbd12b3d30f4ff6694d99d63033eb31b88946211.tar.gz
Merge branch 'PHP-7.4'
Diffstat (limited to 'sapi')
-rw-r--r--sapi/fpm/tests/fcgi.inc6
1 files changed, 2 insertions, 4 deletions
diff --git a/sapi/fpm/tests/fcgi.inc b/sapi/fpm/tests/fcgi.inc
index 7e3ad0514b..f31811aef6 100644
--- a/sapi/fpm/tests/fcgi.inc
+++ b/sapi/fpm/tests/fcgi.inc
@@ -589,9 +589,7 @@ class Client
// but still not get the response requested
$startTime = microtime(true);
- do {
- $resp = $this->readPacket();
-
+ while ($resp = $this->readPacket()) {
if ($resp['type'] == self::STDOUT || $resp['type'] == self::STDERR) {
if ($resp['type'] == self::STDERR) {
$this->_requests[$resp['requestId']]['state'] = self::REQ_STATE_ERR;
@@ -612,7 +610,7 @@ class Client
$this->set_ms_timeout($this->_readWriteTimeout);
throw new \Exception('Timed out');
}
- } while ($resp);
+ }
if (!is_array($resp)) {
$info = stream_get_meta_data($this->_sock);