Important fix: Whilst apache sends name-value pairs in individual params records, nginx utilises that the specification allows them to be sent in the same record. This is now accounted for.

Author: AndrewCarterUK

src/ConnectionHandler/ConnectionHandler.php

@@ -246,37 +246,61 @@ private function processParamsRecord($requestId, $contentData)
             return;
         }
 
-        $initialBytes = unpack('C5', $contentData);
+        do {
+            $this->readNameValuePair($requestId, $contentData);
+        } while (strlen($contentData) > 0);
+    }
 
-        $extendedLengthName  = $initialBytes[1] & 0x80;
-        $extendedLengthValue = $extendedLengthName ? $initialBytes[5] & 0x80 : $initialBytes[2] & 0x80;
+    /**
+     * Read a FastCGI name-value pair from a buffer and add it to the request params
+     * 
+     * @param int    $requestId The request id that sent the name-value pair
+     * @param string $buffer    The buffer to read the pair from (pass by reference)
+     */
+    private function readNameValuePair($requestId, &$buffer)
+    {
+        $nameLength  = $this->readFieldLength($buffer);
+        $valueLength = $this->readFieldLength($buffer);
 
-        $structureFormat = (
-            ($extendedLengthName  ? 'N' : 'C').'nameLength/'.
-            ($extendedLengthValue ? 'N' : 'C').'valueLength'
+        $contentFormat = (
+            'a'.$nameLength.'name/'.
+            'a'.$valueLength.'value/'
         );
 
-        $structure = unpack($structureFormat, $contentData);
+        $content = unpack($contentFormat, $buffer);
+        $this->requests[$requestId]['params'][$content['name']] = $content['value'];
 
-        if ($extendedLengthName) {
-            $structure['nameLength'] &= 0x7FFFFFFF;
-        }
+        $buffer = substr($buffer, $nameLength + $valueLength);
+    }
 
-        if ($extendedLengthValue) {
-            $structure['valueLength'] &= 0x7FFFFFFF;
+    /**
+     * Read the field length of a FastCGI name-value pair from a buffer
+     * 
+     * @param string $buffer The buffer to read the field length from (pass by reference)
+     * 
+     * @return int The length of the field
+     */
+    private function readFieldLength(&$buffer)
+    {
+        $block = unpack('C4', $buffer);
+        $skip  = 1;
+
+        if ($block[1] & 0x80) {
+            $length = (
+                (($block[1] & 0x7F) << 24) |
+                 ($block[2]         << 16) |
+                 ($block[3]         <<  8) |
+                  $block[4]
+            );
+
+            $skip = 4;
+        } else {
+            $length = $block[1];
         }
 
-        $skipLength = ($extendedLengthName ? 4 : 1) + ($extendedLengthValue ? 4 : 1);
-
-        $contentFormat = (
-            'x'.$skipLength.'/'.
-            'a'.$structure['nameLength'].'name/'.
-            'a'.$structure['valueLength'].'value/'
-        );
+        $buffer = substr($buffer, $skip);
 
-        $content = unpack($contentFormat, $contentData);
-
-        $this->requests[$requestId]['params'][$content['name']] = $content['value'];
+        return $length;
     }
 
     /**

test/Client/ConnectionWrapper.php

@@ -97,10 +97,7 @@ public function readRecord(\PHPUnit_Framework_TestCase $testCase)
     public function writeRequest($requestId, array $params, $body)
     {
         $this->writeBeginRequestRecord($requestId, DaemonInterface::FCGI_RESPONDER, 0);
-
-        foreach ($params as $name => $value) {
-            $this->writeParamsRecord($requestId, $name, $value);
-        }
+        $this->writeParamsRecord($requestId, $params);
 
         $this->writeParamsRecord($requestId);
 
@@ -147,13 +144,12 @@ public function writeBeginRequestRecord($requestId, $role, $flags)
     /**
      * Write a params record.
      *
-     * @param int    $requestId
-     * @param string $name
-     * @param string $value
+     * @param int   $requestId
+     * @param array $params
      */
-    public function writeParamsRecord($requestId, $name = null, $value = null)
+    public function writeParamsRecord($requestId, array $params = null)
     {
-        if (null === $name && null === $value) {
+        if (null === $params) {
             $this->writeRecord(DaemonInterface::FCGI_PARAMS, $requestId);
 
             return;
@@ -171,11 +167,13 @@ public function writeParamsRecord($requestId, $name = null, $value = null)
             }
         };
 
-        $addLength($name);
-        $addLength($value);
+        foreach ($params as $name => $value) {
+            $addLength($name);
+            $addLength($value);
 
-        $content .= $name;
-        $content .= $value;
+            $content .= $name;
+            $content .= $value;
+        }
 
         $contentLength = strlen($content);
         $paddingLength = ((int) ceil(((float) $contentLength) / 8.0) * 8) - $contentLength;

test/ConnectionHandler/ConnectionHandlerTest.php

@@ -103,7 +103,7 @@ public function testShutdown()
 
         // Write half of the first request (id 0)
         $context['clientWrapper']->writeBeginRequestRecord(0, DaemonInterface::FCGI_RESPONDER, DaemonInterface::FCGI_KEEP_CONNECTION);
-        $context['clientWrapper']->writeParamsRecord(0, 'foo', 'bar');
+        $context['clientWrapper']->writeParamsRecord(0, ['foo' => 'bar']);
         $context['clientWrapper']->writeParamsRecord(0);
 
         // Process first half of the first request