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

keeping deprecated auth method functional

Browse Source
This commit is contained in:
Ahmad Nassri
2015-02-05 12:22:46 -05:00
parent 96cdf61101
commit 2074abf904
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Unirest/Request.php
View File

@@ -12,7 +12,7 @@ class Request
private static $socketTimeout = null; private static $socketTimeout = null;
private static $defaultHeaders = array(); private static $defaultHeaders = array();
private static $auth => array ( private static $auth = array (
'user' => '', 'user' => '',
'pass' => '', 'pass' => '',
'method' => CURLAUTH_BASIC 'method' => CURLAUTH_BASIC
@@ -342,7 +342,14 @@ class Request
curl_setopt($ch, CURLOPT_TIMEOUT, self::$socketTimeout); curl_setopt($ch, CURLOPT_TIMEOUT, self::$socketTimeout);
} }
if (!empty($self::auth['user'])) { // supporting deprecated http auth method
if (!empty($username)) {
curl_setopt($ch, CURLOPT_USERNAME, $username);
curl_setopt($ch, CURLOPT_PASSWORD, $password);
curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
}
if (!empty(self::$auth['user'])) {
curl_setopt($ch, CURLOPT_USERNAME, self::$auth['user']); curl_setopt($ch, CURLOPT_USERNAME, self::$auth['user']);
curl_setopt($ch, CURLOPT_PASSWORD, self::$auth['pass']); curl_setopt($ch, CURLOPT_PASSWORD, self::$auth['pass']);
curl_setopt($ch, CURLOPT_HTTPAUTH, self::$auth['method']); curl_setopt($ch, CURLOPT_HTTPAUTH, self::$auth['method']);