Merge pull request #9 from silverstripe-labs/pulls/cpu-usage-curl-multi

Avoid 100% CPU on curl_multi_exec
This commit is contained in:
Sean Harvey 2014-05-12 17:13:06 +12:00
commit 9d930c1901

View File

@ -45,7 +45,8 @@ class ExternalURLCheck implements EnvironmentCheck {
// Execute the handles // Execute the handles
do { do {
$mrc = curl_multi_exec($mh, $active); $mrc = curl_multi_exec($mh, $active);
} while ($mrc == CURLM_CALL_MULTI_PERFORM); curl_multi_select($mh);
} while ($active > 0);
while ($active && $mrc == CURLM_OK) { while ($active && $mrc == CURLM_OK) {
if (curl_multi_select($mh) != -1) { if (curl_multi_select($mh) != -1) {