mirror_php/guzzle
1
0
Fork 0
mirror of https://github.com/guzzle/guzzle.git synced 2025-02-25 10:33:18 +01:00
Code Issues Releases Wiki Activity

[Http] Fixing the CURLM_CALL_MULTI_PERFORM issue when checking for cURL

Browse Source 
exceptions. Closes #141
This commit is contained in:
Michael Dowling 2012-09-28 10:07:00 -07:00
parent aa493c416e
commit 6bcb1460ea
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Guzzle/Http/Curl/CurlMulti.php
View File

@ -447,7 +447,9 @@ class CurlMulti extends AbstractHasDispatcher implements CurlMultiInterface
}
if ($selectResult === 0) {
while ($mrc = curl_multi_exec($this->multiHandle, $active) == CURLM_CALL_MULTI_PERFORM);
do {
$mrc = curl_multi_exec($this->multiHandle, $active);
} while ($mrc == CURLM_CALL_MULTI_PERFORM);
// Check the return value to ensure an error did not occur
$this->checkCurlResult($mrc);
}
@ -553,7 +555,7 @@ class CurlMulti extends AbstractHasDispatcher implements CurlMultiInterface
*/
private function isCurlException(RequestInterface $request, CurlHandle $handle, array $curl)
{
if (CURLE_OK == $curl['result']) {
if (CURLM_OK == $curl['result'] || CURLM_CALL_MULTI_PERFORM == $curl['result']) {
return false;
}
@ -577,7 +579,7 @@ class CurlMulti extends AbstractHasDispatcher implements CurlMultiInterface
*/
private function checkCurlResult($code)
{
if ($code != CURLE_OK) {
if ($code != CURLM_OK && $code != CURLM_CALL_MULTI_PERFORM) {
if (isset($this->multiErrors[$code])) {
$message = "cURL error: {$code} ({$this->multiErrors[$code][0]}): cURL message: {$this->multiErrors[$code][1]}";
} else {