manually applying PR by @daydiff due to complex merge issues, closes #67

This commit is contained in:
Ahmad Nassri
2015-04-02 14:11:23 -04:00
parent d508bd9628
commit 217b436124

View File

@@ -7,11 +7,12 @@ use Unirest\Response;
class Request class Request
{ {
private static $cookieFile = null;
private static $defaultHeaders = array();
private static $handle = null; private static $handle = null;
private static $jsonOpts = array(); private static $jsonOpts = array();
private static $verifyPeer = true;
private static $socketTimeout = null; private static $socketTimeout = null;
private static $defaultHeaders = array(); private static $verifyPeer = true;
private static $auth = array ( private static $auth = array (
'user' => '', 'user' => '',
@@ -102,6 +103,18 @@ class Request
return self::defaultHeader('X-Mashape-Key', $key); return self::defaultHeader('X-Mashape-Key', $key);
} }
/**
* Set a coockie file path for enabling coockie handling
*
* $cookieFile must be a correct path with permission to write to them
*
* @param string $cookieFile - path to file for saving coockie
*/
public static function cookieFile($cookieFile)
{
self::$cookieFile = $cookieFile;
}
/** /**
* Clear all the default headers * Clear all the default headers
*/ */
@@ -360,6 +373,11 @@ class Request
curl_setopt(self::$handle, CURLOPT_TIMEOUT, self::$socketTimeout); curl_setopt(self::$handle, CURLOPT_TIMEOUT, self::$socketTimeout);
} }
if (self::$cookieFile) {
curl_setopt($ch, CURLOPT_COOKIEFILE, self::$cookieFile);
curl_setopt($ch, CURLOPT_COOKIEJAR, self::$cookieFile);
}
// supporting deprecated http auth method // supporting deprecated http auth method
if (!empty($username)) { if (!empty($username)) {
curl_setopt_array(self::$handle, array( curl_setopt_array(self::$handle, array(