Merge pull request #86 from Mashape/curlopts-override-fix

allow to override curlopts
Kong · Dec 11, 2015 · e11c54d · e11c54d
2 parents fde6f41 + a3312a0
commit e11c54d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Unirest/Request.php b/src/Unirest/Request.php
@@ -387,9 +387,6 @@ public static function send($method, $url, $body = null, $headers = array(), $us
     {
         self::$handle = curl_init();
 
-        // start with default options
-        curl_setopt_array(self::$handle, self::$curlOpts);
-
         if ($method !== Method::GET) {
             curl_setopt(self::$handle, CURLOPT_CUSTOMREQUEST, $method);
 
@@ -421,6 +418,9 @@ public static function send($method, $url, $body = null, $headers = array(), $us
             // If an empty string, '', is set, a header containing all supported encoding types is sent
             CURLOPT_ENCODING => ''
         ));
+
+        // update options
+        curl_setopt_array(self::$handle, self::$curlOpts);
 
         if (self::$socketTimeout !== null) {
             curl_setopt(self::$handle, CURLOPT_TIMEOUT, self::$socketTimeout);