Ensure options set are used when make requests in parallel

Author: zachborboa

Curl.class.php

@@ -4,6 +4,7 @@ class Curl {
 
     private $_cookies = array();
     private $_headers = array();
+    private $_options = array();
 
     private $_multi_parent = FALSE;
     private $_multi_child = FALSE;
@@ -65,6 +66,12 @@ public function get($url_mixed, $data=array()) {
                 }
             }
 
+            foreach ($this->curls as $ch) {
+                foreach ($this->_options as $key => $value) {
+                    $ch->setOpt($key, $value);
+                }
+            }
+
             do {
                 $status = curl_multi_exec($curl_multi, $active);
             } while ($status === CURLM_CALL_MULTI_PERFORM || $active);
@@ -132,6 +139,7 @@ public function setCookie($key, $value) {
 
     public function setOpt($option, $value, $_ch=NULL) {
         $ch = is_null($_ch) ? $this->curl : $_ch;
+        $this->_options[$option] = $value;
         return curl_setopt($ch, $option, $value);
     }
 

tests/run.php

@@ -298,6 +298,22 @@ public function testParallelRequests() {
         $this->assertTrue(substr($curl->curls['2']->response, - $len) === '/c/?foo=bar');
     }
 
+    public function testParallelSetOptions() {
+        $curl = new Curl();
+        $curl->setHeader('X-DEBUG-TEST', 'server');
+        $curl->setOpt(CURLOPT_SSL_VERIFYPEER, FALSE);
+        $curl->setOpt(CURLOPT_SSL_VERIFYHOST, FALSE);
+        $curl->setOpt(CURLOPT_USERAGENT, 'useragent');
+        $curl->complete(function($instance) {
+            PHPUnit_Framework_Assert::assertTrue($instance->response === 'useragent');
+        });
+        $curl->get(array(
+            Test::TEST_URL,
+        ), array(
+            'key' => 'HTTP_USER_AGENT',
+        ));
+    }
+
     public function testSuccessCallback() {
         $success_called = FALSE;
         $error_called = FALSE;