Merge pull request php-vcr#151 from thormeier/fix-parallel-curl-requests

Fix parallel cURL requests

Author: renatomefi

src/VCR/LibraryHooks/CurlHook.php

@@ -46,9 +46,9 @@ class CurlHook implements LibraryHook
  protected static $multiHandles = array();
 
  /**
- * @var resource Last active curl_multi_exec() handle.
+ * @var array Last active curl_multi_exec() handles.
  */
- protected static $multiExecLastCh;
+ protected static $multiExecLastChs = array();
 
  /**
  * @var AbstractCodeTransform
@@ -253,7 +253,7 @@ public static function curlMultiExec($multiHandle, &$stillRunning)
  if (isset(self::$multiHandles[(int) $multiHandle])) {
  foreach (self::$multiHandles[(int) $multiHandle] as $curlHandle) {
  if (!isset(self::$responses[(int) $curlHandle])) {
- self::$multiExecLastCh = $curlHandle;
+ self::$multiExecLastChs[] = $curlHandle;
  self::curlExec($curlHandle);
  }
  }
@@ -271,13 +271,12 @@ public static function curlMultiExec($multiHandle, &$stillRunning)
  */
  public static function curlMultiInfoRead()
  {
- if (self::$multiExecLastCh) {
+ if (!empty(self::$multiExecLastChs)) {
  $info = array(
  'msg' => CURLMSG_DONE,
- 'handle' => self::$multiExecLastCh,
+ 'handle' => array_pop(self::$multiExecLastChs),
  'result' => CURLE_OK
  );
- self::$multiExecLastCh = null;
 
  return $info;
  }

tests/VCR/LibraryHooks/CurlHookTest.php

@@ -266,8 +266,10 @@ function (Request $request) use ($testClass, &$callCount) {
  curl_multi_add_handle($curlMultiHandle, $curlHandle2);
 
  $mh = curl_multi_exec($curlMultiHandle);
- $lastInfo = curl_multi_info_read($mh);
- $afterLastInfo = curl_multi_info_read($mh);
+
+ $lastInfo = curl_multi_info_read($mh);
+ $secondLastInfo = curl_multi_info_read($mh);
+ $afterLastInfo = curl_multi_info_read($mh);
 
  curl_multi_remove_handle($curlMultiHandle, $curlHandle1);
  curl_multi_remove_handle($curlMultiHandle, $curlHandle2);
@@ -281,6 +283,13 @@ function (Request $request) use ($testClass, &$callCount) {
  $lastInfo,
  'When called the first time curl_multi_info_read should return last curl info.'
  );
+
+ $this->assertEquals(
+ array('msg' => 1, 'result' => 0, 'handle' => $curlHandle1),
+ $secondLastInfo,
+ 'When called the second time curl_multi_info_read should return second to last curl info.'
+ );
+
  $this->assertFalse($afterLastInfo, 'Multi info called the last time should return false.');
  }