summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-07-19 10:06:30 +0200
committerNikita Popov <nikita.ppv@gmail.com>2019-07-19 10:06:30 +0200
commiteb766751dc17292b730b74f7188bb77c2c30e4d4 (patch)
tree98babffe96a46dcab01a2bbac49abb23c06396f5 /sapi
parent3cc6dd9c766b9a69d898fbb6dbf0bed79dc34b34 (diff)
parentd574df63dc375f5fc9202ce5afde23f866b6450a (diff)
downloadphp-git-eb766751dc17292b730b74f7188bb77c2c30e4d4.tar.gz
Merge branch 'PHP-7.4'
Diffstat (limited to 'sapi')
-rw-r--r--sapi/fpm/tests/fcgi.inc30
1 files changed, 15 insertions, 15 deletions
diff --git a/sapi/fpm/tests/fcgi.inc b/sapi/fpm/tests/fcgi.inc
index f31811aef6..721b94b504 100644
--- a/sapi/fpm/tests/fcgi.inc
+++ b/sapi/fpm/tests/fcgi.inc
@@ -362,19 +362,19 @@ class Client
while ($p != $length) {
- $nlen = ord($data{$p++});
+ $nlen = ord($data[$p++]);
if ($nlen >= 128) {
$nlen = ($nlen & 0x7F << 24);
- $nlen |= (ord($data{$p++}) << 16);
- $nlen |= (ord($data{$p++}) << 8);
- $nlen |= (ord($data{$p++}));
+ $nlen |= (ord($data[$p++]) << 16);
+ $nlen |= (ord($data[$p++]) << 8);
+ $nlen |= (ord($data[$p++]));
}
- $vlen = ord($data{$p++});
+ $vlen = ord($data[$p++]);
if ($vlen >= 128) {
$vlen = ($nlen & 0x7F << 24);
- $vlen |= (ord($data{$p++}) << 16);
- $vlen |= (ord($data{$p++}) << 8);
- $vlen |= (ord($data{$p++}));
+ $vlen |= (ord($data[$p++]) << 16);
+ $vlen |= (ord($data[$p++]) << 8);
+ $vlen |= (ord($data[$p++]));
}
$array[substr($data, $p, $nlen)] = substr($data, $p+$nlen, $vlen);
$p += ($nlen + $vlen);
@@ -392,12 +392,12 @@ class Client
private function decodePacketHeader($data)
{
$ret = array();
- $ret['version'] = ord($data{0});
- $ret['type'] = ord($data{1});
- $ret['requestId'] = (ord($data{2}) << 8) + ord($data{3});
- $ret['contentLength'] = (ord($data{4}) << 8) + ord($data{5});
- $ret['paddingLength'] = ord($data{6});
- $ret['reserved'] = ord($data{7});
+ $ret['version'] = ord($data[0]);
+ $ret['type'] = ord($data[1]);
+ $ret['requestId'] = (ord($data[2]) << 8) + ord($data[3]);
+ $ret['contentLength'] = (ord($data[4]) << 8) + ord($data[5]);
+ $ret['paddingLength'] = ord($data[6]);
+ $ret['reserved'] = ord($data[7]);
return $ret;
}
@@ -634,7 +634,7 @@ class Client
// Reset timeout
$this->set_ms_timeout($this->_readWriteTimeout);
- switch (ord($resp['content']{4})) {
+ switch (ord($resp['content'][4])) {
case self::CANT_MPX_CONN:
throw new \Exception('This app can\'t multiplex [CANT_MPX_CONN]');
break;