[HttpClient] display proper error message on TransportException when curl is used

nicolas-grekas · nicolas-grekas · commit cb63b1290c32 · 2019-05-22T17:58:34.000+02:00
diff --git a/src/Symfony/Component/HttpClient/Response/CurlResponse.php b/src/Symfony/Component/HttpClient/Response/CurlResponse.php
@@ -245,7 +245,7 @@ private static function perform(CurlClientState $multi, array &$responses = null
 
             while ($info = curl_multi_info_read($multi->handle)) {
                 $multi->handlesActivity[(int) $info['handle']][] = null;
-                $multi->handlesActivity[(int) $info['handle']][] = \in_array($info['result'], [\CURLE_OK, \CURLE_TOO_MANY_REDIRECTS], true) || (\CURLE_WRITE_ERROR === $info['result'] && 'destruct' === @curl_getinfo($info['handle'], CURLINFO_PRIVATE)) ? null : new TransportException(curl_error($info['handle']));
+                $multi->handlesActivity[(int) $info['handle']][] = \in_array($info['result'], [\CURLE_OK, \CURLE_TOO_MANY_REDIRECTS], true) || (\CURLE_WRITE_ERROR === $info['result'] && 'destruct' === @curl_getinfo($info['handle'], CURLINFO_PRIVATE)) ? null : new TransportException(curl_strerror($info['result']).' for '.curl_getinfo($info['handle'], CURLINFO_EFFECTIVE_URL));
             }
         } finally {
             self::$performing = false;

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ private static function perform(CurlClientState $multi, array &$responses = null`
`245`	`245`
`246`	`246`	`while ($info = curl_multi_info_read($multi->handle)) {`
`247`	`247`	`$multi->handlesActivity[(int) $info['handle']][] = null;`
`248`		`- $multi->handlesActivity[(int) $info['handle']][] = \in_array($info['result'], [\CURLE_OK, \CURLE_TOO_MANY_REDIRECTS], true) \|\| (\CURLE_WRITE_ERROR === $info['result'] && 'destruct' === @curl_getinfo($info['handle'], CURLINFO_PRIVATE)) ? null : new TransportException(curl_error($info['handle']));`
	`248`	`+ $multi->handlesActivity[(int) $info['handle']][] = \in_array($info['result'], [\CURLE_OK, \CURLE_TOO_MANY_REDIRECTS], true) \|\| (\CURLE_WRITE_ERROR === $info['result'] && 'destruct' === @curl_getinfo($info['handle'], CURLINFO_PRIVATE)) ? null : new TransportException(curl_strerror($info['result']).' for '.curl_getinfo($info['handle'], CURLINFO_EFFECTIVE_URL));`
`249`	`249`	`}`
`250`	`250`	`} finally {`
`251`	`251`	`self::$performing = false;`