Merge branch 'hotfix/131-follow-100-continue' into develop

Forward port #131

Author: weierophinney

CHANGELOG.md

@@ -40,6 +40,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
+- introduces changes to `Response::fromString()` to pull the next line of the response
+  and parse it for the status when a 100 status code is initially encountered, per https://tools.ietf.org/html/rfc7231\#section-6.2.1
+
 - [#122](https://github.com/zendframework/zend-http/pull/122) fixes an issue with the stream response whereby if the `outputstream`
   option is set, the output file was opened twice; it is now opened exactly once.
 

src/Response.php

@@ -7,6 +7,7 @@
 
 namespace Zend\Http;
 
+use Zend\Http\Exception\RuntimeException;
 use Zend\Stdlib\ErrorHandler;
 use Zend\Stdlib\ResponseInterface;
 
@@ -189,20 +190,18 @@ public static function fromString($string)
         $firstLine = array_shift($lines);
 
         $response = new static();
+        $response->parseStatusLine($firstLine);
 
-        $regex   = '/^HTTP\/(?P<version>1\.[01]) (?P<status>\d{3})(?:[ ]+(?P<reason>.*))?$/';
-        $matches = [];
-        if (! preg_match($regex, $firstLine, $matches)) {
-            throw new Exception\InvalidArgumentException(
-                'A valid response status line was not found in the provided string'
-            );
+        /**
+         * @link https://tools.ietf.org/html/rfc7231#section-6.2.1
+         */
+        if ($response->statusCode === static::STATUS_CODE_100) {
+            $next = array_shift($lines); // take next line
+            $next = empty($next) ? array_shift($lines) : $next; // take next or skip if empty
+            $response->parseStatusLine($next);
         }
 
-        $response->version = $matches['version'];
-        $response->setStatusCode($matches['status']);
-        $response->setReasonPhrase((isset($matches['reason']) ? $matches['reason'] : ''));
-
-        if (empty($lines)) {
+        if (count($lines) === 0) {
             return $response;
         }
 
@@ -243,6 +242,26 @@ public static function fromString($string)
         return $response;
     }
 
+    /**
+     * @param string $line
+     * @throws Exception\InvalidArgumentException
+     * @throws Exception\RuntimeException
+     */
+    protected function parseStatusLine($line)
+    {
+        $regex   = '/^HTTP\/(?P<version>1\.[01]) (?P<status>\d{3})(?:[ ]+(?P<reason>.*))?$/';
+        $matches = [];
+        if (! preg_match($regex, $line, $matches)) {
+            throw new Exception\InvalidArgumentException(
+                'A valid response status line was not found in the provided string'
+            );
+        }
+
+        $this->version = $matches['version'];
+        $this->setStatusCode($matches['status']);
+        $this->setReasonPhrase((isset($matches['reason']) ? $matches['reason'] : ''));
+    }
+
     /**
      * @return Header\SetCookie[]
      */

test/ResponseTest.php

@@ -451,6 +451,16 @@ public function testPreventsCRLFAttackWhenDeserializing()
         );
     }
 
+    public function test100ContinueFromString()
+    {
+        $fixture = 'TOKEN=EC%XXXXXXXXXXXXX&TIMESTAMP=2017%2d10%2d10T09%3a02%3a55Z'
+            ."&CORRELATIONID=XXXXXXXXXX&ACK=Success&VERSION=65%2e1&BUILD=XXXXXXXXXX\r\n";
+
+        $request = Response::fromString($this->readResponse('response_100_continue'));
+        $this->assertEquals(Response::STATUS_CODE_200, $request->getStatusCode());
+        $this->assertEquals($fixture, $request->getBody());
+    }
+
     /**
      * Helper function: read test response from file
      *

test/_files/response_100_continue

@@ -0,0 +1,17 @@
+HTTP/1.1 100 Continue
+
+HTTP/1.1 200 OK
+Date: Tue, 10 Oct 2017 09:02:53 GMT
+Server: Apache
+X-SLR-RETRY-API: SetExpressCheckout
+X-PAYPAL-OPERATION-NAME: SetExpressCheckout
+X-PAYPAL-API-RC:
+Connection: close
+HTTP_X_PP_AZ_LOCATOR: sandbox.slc
+Paypal-Debug-Id: e8abe44ddc3bd
+Set-Cookie: X-PP-SILOVER=name%3DSANDBOX3.API.1%26silo_version%3D1880%26app%3Dappdispatcher_apit%26TIME%3D3196902489%26HTTP_X_PP_AZ_LOCATOR%3Dsandbox.slc; Expires=Tue, 10 Oct 2017 09:32:55 GMT; domain=.paypal.com; path=/; Secure; HttpOnly
+Set-Cookie: X-PP-SILOVER=; Expires=Thu, 01 Jan 1970 00:00:01 GMT
+Content-Length: 137
+Content-Type: text/plain; charset=utf-8
+
+TOKEN=EC%XXXXXXXXXXXXX&TIMESTAMP=2017%2d10%2d10T09%3a02%3a55Z&CORRELATIONID=XXXXXXXXXX&ACK=Success&VERSION=65%2e1&BUILD=XXXXXXXXXX