bitmotor/unirest-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #88 from frankdee/master

Browse Source 
improved solution to override cURL options …
This commit is contained in:
Ahmad Nassri
2015-12-15 17:22:11 -05:00
parent e11c54d29c be5ee63ad1
commit da71f063cf
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Unirest/Request.php
View File

@@ -110,10 +110,11 @@ class Request
* Set curl options to send on every request * Set curl options to send on every request
* *
* @param array $options options array * @param array $options options array
* @return array
*/ */
public static function curlOpts($opts) public static function curlOpts($options)
{ {
return array_merge(self::$curlOpts, $opts); return self::mergeCurlOptions(self::$curlOpts, $options);
} }
/** /**
@@ -405,7 +406,7 @@ class Request
$url .= urldecode(http_build_query(self::buildHTTPCurlQuery($body))); $url .= urldecode(http_build_query(self::buildHTTPCurlQuery($body)));
} }
curl_setopt_array(self::$handle, array( $curl_base_options = [
CURLOPT_URL => self::encodeUrl($url), CURLOPT_URL => self::encodeUrl($url),
CURLOPT_RETURNTRANSFER => true, CURLOPT_RETURNTRANSFER => true,
CURLOPT_FOLLOWLOCATION => true, CURLOPT_FOLLOWLOCATION => true,
@@ -417,10 +418,9 @@ class Request
CURLOPT_SSL_VERIFYHOST => self::$verifyHost === false ? 0 : 2, CURLOPT_SSL_VERIFYHOST => self::$verifyHost === false ? 0 : 2,
// If an empty string, '', is set, a header containing all supported encoding types is sent // If an empty string, '', is set, a header containing all supported encoding types is sent
CURLOPT_ENCODING => '' CURLOPT_ENCODING => ''
)); ];
// update options curl_setopt_array(self::$handle, self::mergeCurlOptions($curl_base_options, self::$curlOpts));
curl_setopt_array(self::$handle, self::$curlOpts);
if (self::$socketTimeout !== null) { if (self::$socketTimeout !== null) {
curl_setopt(self::$handle, CURLOPT_TIMEOUT, self::$socketTimeout); curl_setopt(self::$handle, CURLOPT_TIMEOUT, self::$socketTimeout);
@@ -558,4 +558,15 @@ class Request
$key = trim(strtolower($key)); $key = trim(strtolower($key));
return $key . ': ' . $val; return $key . ': ' . $val;
} }
/**
* @param array $existing_options
* @param array $new_options
* @return array
*/
private static function mergeCurlOptions(&$existing_options, $new_options)
{
$existing_options = $new_options + $existing_options;
return $existing_options;
}
} }