Adding curl error string. Closes #30

guzzle · May 21, 2015 · 9465032 · 9465032
1 parent dbbb91d
commit 9465032
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/Client/CurlMultiHandler.php b/src/Client/CurlMultiHandler.php
@@ -230,9 +230,7 @@ private function processMessages()
 
             if ($done['result'] !== CURLM_OK) {
                 $entry['response']['curl']['errno'] = $done['result'];
-                if (function_exists('curl_strerror')) {
-                    $entry['response']['curl']['error'] = curl_strerror($done['result']);
-                }
+                $entry['response']['curl']['error'] = curl_error($done['handle']);
             }
 
             $result = CurlFactory::createResponse(

diff --git a/tests/Client/CurlMultiHandlerTest.php b/tests/Client/CurlMultiHandlerTest.php
@@ -162,4 +162,20 @@ public function testSendsNonLazyFutures()
         $this->assertInstanceOf('GuzzleHttp\Ring\Future\FutureArray', $response);
         $this->assertEquals(202, $response['status']);
     }
+
+    public function testExtractsErrors()
+    {
+        $request = [
+            'http_method' => 'GET',
+            'headers'     => ['host' => ['127.0.0.1:123']],
+            'future'      => true,
+        ];
+        Server::flush();
+        Server::enqueue([['status' => 202]]);
+        $a = new CurlMultiHandler();
+        $response = $a($request);
+        $this->assertInstanceOf('GuzzleHttp\Ring\Future\FutureArray', $response);
+        $this->assertEquals(CURLE_COULDNT_CONNECT, $response['curl']['errno']);
+        $this->assertNotEmpty($response['curl']['error']);
+    }
 }