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

Avoid 100% CPU on curl_multi_exec
2014-05-12 17:13:06 +12:00 · 2014-05-12 17:13:06 +12:00 · 9d930c1901
parent 815a1ad6db 2bbcde2b64
commit 9d930c1901
1 changed files with 2 additions and 1 deletions
--- a/code/checks/ExternalURLCheck.php
+++ b/code/checks/ExternalURLCheck.php
@ -45,7 +45,8 @@ class ExternalURLCheck implements EnvironmentCheck {
 		// Execute the handles
 		do {
 			$mrc = curl_multi_exec($mh, $active);
-		} while ($mrc == CURLM_CALL_MULTI_PERFORM);
+			curl_multi_select($mh);
+		} while ($active > 0);

 		while ($active && $mrc == CURLM_OK) {
 			if (curl_multi_select($mh) != -1) {