control connection auto close on error

juliangut · Apr 21, 2017 · d8a28e1 · d8a28e1
1 parent 175274c
commit d8a28e1
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 6 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -29,6 +29,13 @@ class Client
      */
     private $transport;
 
+    /**
+     * Auto close on error.
+     *
+     * @var bool
+     */
+    private $closeOnError = true;
+
     /**
      * @param TransportInterface|null $transport
      */
@@ -61,6 +68,26 @@ public function getTransport()
         return $this->transport;
     }
 
+    /**
+     * Set automatic connection close on error.
+     *
+     * @param bool $closeOnError
+     */
+    public function setCloseOnError($closeOnError)
+    {
+        $this->closeOnError = $closeOnError === true;
+    }
+
+    /**
+     * Check if automatic connection close on error is active.
+     *
+     * @return bool
+     */
+    public function isCloseOnError()
+    {
+        return $this->closeOnError;
+    }
+
     /**
      * Run PSR7 request.
      *
@@ -90,7 +117,9 @@ public function request(
                 $flags
             );
         } catch (TransportException $exception) {
-            $transport->close();
+            if ($this->closeOnError) {
+                $transport->close();
+            }
 
             // Bubble exception
             throw $exception;
@@ -141,7 +170,7 @@ protected function getTransferHeaders(array $transferHeaders, $transferContent,
         ];
 
         foreach ($transferHeaders as $header) {
-            if (preg_match('/^HTTP\/(1\.\d) +([1-5][0-9]{2}) +.+$/', $header, $matches)) {
+            if (preg_match('/^HTTP\/(1\.\d) +([1-5]\d{2}) +.+$/', $header, $matches)) {
                 $responseHeaders['Protocol-Version'] = $matches[1];
                 $responseHeaders['Status'] = $matches[2];
             } elseif (strpos($header, ':') !== false) {
@@ -178,7 +207,7 @@ protected function populateResponse(ResponseInterface $response, array $headers,
             $response = $response->withHeader($name, (string) $value);
         }
 
-        $body = new Stream('php://temp', 'r+');
+        $body = new Stream('php://temp', 'wb+');
         $body->write($content);
 
         return $response->withBody($body);

diff --git a/src/Transport/Curl.php b/src/Transport/Curl.php
@@ -167,8 +167,6 @@ public function request($method, $uri, array $headers = [], array $vars = [], ar
                 array_key_exists($errCode, static::$errorCategoryMap) ? static::$errorCategoryMap [$errCode] : ''
             );
 
-            $this->close();
-
             throw $exception;
         }
 

diff --git a/tests/Spiral/ClientTest.php b/tests/Spiral/ClientTest.php
@@ -22,7 +22,7 @@
  */
 class ClientTest extends \PHPUnit_Framework_TestCase
 {
-    public function testGettersSetters()
+    public function testTransport()
     {
         /* @var TransportInterface $transport */
         $transport = $this->getMockBuilder(TransportInterface::class)
@@ -35,6 +35,17 @@ public function testGettersSetters()
         static::assertEquals($transport, $client->getTransport());
     }
 
+    public function testAutoClose()
+    {
+        $client = new Client();
+
+        static::assertTrue($client->isCloseOnError());
+
+        $client->setCloseOnError(false);
+
+        static::assertFalse($client->isCloseOnError());
+    }
+
     public function testBadRequest()
     {
         $request = new Request('http://fake_made_up_web.com', 'GET');