Merge branch 'mlocati-fix-curl-timeout-detection'

Author: ezimuel

src/Client/Adapter/Curl.php

@@ -424,7 +424,7 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = [], $body =
         $request  = curl_getinfo($this->curl, CURLINFO_HEADER_OUT);
         $request .= $body;
 
-        if (empty($this->response)) {
+        if ($response === false || empty($this->response)) {
             throw new AdapterException\RuntimeException("Error in cURL request: " . curl_error($this->curl));
         }
 

test/Client/CurlTest.php

@@ -433,4 +433,25 @@ public function testNoCaseSensitiveHeaderName()
         $this->assertFalse($headers->has('Transfer-Encoding'));
         $this->assertFalse($headers->has('Content-Encoding'));
     }
+
+    public function testTimeoutDetection()
+    {
+        $this->client
+            ->setOptions([
+                'timeout' => 1,
+            ])
+            ->setStream(true)
+            ->setMethod('GET')
+            ->setUri(
+                getenv('TESTS_ZEND_HTTP_CLIENT_BIGRESOURCE_URI') ?:
+                'http://de.releases.ubuntu.com/16.04.1/ubuntu-16.04.1-server-i386.iso'
+            );
+        $error = null;
+        try {
+            $this->client->send();
+        } catch (\Exception $x) {
+            $error = $x;
+        }
+        $this->assertNotNull($error, 'Failed to detect timeout in cURL adapter');
+    }
 }