Merge pull request #204 from emmetog/patch-1

Allow overriding of curl options
J7mbo · Aug 30, 2016 · a1d9496 · a1d9496
2 parents 6a8982b + d2b3b8e
commit a1d9496
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/TwitterAPIExchange.php b/TwitterAPIExchange.php
@@ -288,13 +288,13 @@ public function performRequest($return = true, $curlOptions = array())
             $curlOptions[CURLOPT_CUSTOMREQUEST] = $this->requestMethod;
         }
 
-        $options = array(
+        $options = $curlOptions + array(
             CURLOPT_HTTPHEADER => $header,
             CURLOPT_HEADER => false,
             CURLOPT_URL => $this->url,
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_TIMEOUT => 10,
-        ) + $curlOptions;
+        );
 
         if (!is_null($postfields))
         {