Skip to content

Commit aa74a1c

Browse files
committed
Clean up
1 parent e2b3f7a commit aa74a1c

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/Curl/MultiCurl.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -669,26 +669,26 @@ public function start()
669669

670670
while (!($info_array = curl_multi_info_read($this->multiCurl)) === false) {
671671
if ($info_array['msg'] === CURLMSG_DONE) {
672-
foreach ($this->activeCurls as $key => $ch) {
673-
if ($ch->curl === $info_array['handle']) {
672+
foreach ($this->activeCurls as $key => $curl) {
673+
if ($curl->curl === $info_array['handle']) {
674674
// Set the error code for multi handles using the "result" key in the array returned by
675675
// curl_multi_info_read(). Using curl_errno() on a multi handle will incorrectly return 0
676676
// for errors.
677-
$ch->curlErrorCode = $info_array['result'];
678-
$ch->exec($ch->curl);
677+
$curl->curlErrorCode = $info_array['result'];
678+
$curl->exec($curl->curl);
679679

680-
if ($ch->attemptRetry()) {
680+
if ($curl->attemptRetry()) {
681681
// Remove completed handle before adding again in order to retry request.
682-
curl_multi_remove_handle($this->multiCurl, $ch->curl);
682+
curl_multi_remove_handle($this->multiCurl, $curl->curl);
683683

684-
$curlm_error_code = curl_multi_add_handle($this->multiCurl, $ch->curl);
684+
$curlm_error_code = curl_multi_add_handle($this->multiCurl, $curl->curl);
685685
if (!($curlm_error_code === CURLM_OK)) {
686686
throw new \ErrorException(
687687
'cURL multi add handle error: ' . curl_multi_strerror($curlm_error_code)
688688
);
689689
}
690690
} else {
691-
$ch->execDone();
691+
$curl->execDone();
692692

693693
// Remove completed instance from active curls.
694694
unset($this->activeCurls[$key]);
@@ -697,10 +697,10 @@ public function start()
697697
if (count($this->curls) >= 1) {
698698
$this->initHandle(array_shift($this->curls));
699699
}
700-
curl_multi_remove_handle($this->multiCurl, $ch->curl);
700+
curl_multi_remove_handle($this->multiCurl, $curl->curl);
701701

702702
// Clean up completed instance.
703-
$ch->close();
703+
$curl->close();
704704
}
705705

706706
break;

0 commit comments

Comments
 (0)