-
Notifications
You must be signed in to change notification settings - Fork 234
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
9 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
{ | ||
"name": "codebird-php", | ||
"version": "2.7.0", | ||
"version": "2.7.1", | ||
"homepage": "http://www.jublo.net/projects/codebird/php", | ||
"authors": [ | ||
"Joshua Atkins <[email protected]>", | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ | |
* A Twitter library in PHP. | ||
* | ||
* @package codebird | ||
* @version 2.7.0 | ||
* @version 2.7.1 | ||
* @author Jublo Solutions <[email protected]> | ||
* @copyright 2010-2015 Jublo Solutions <[email protected]> | ||
* @license http://opensource.org/licenses/GPL-3.0 GNU General Public License 3.0 | ||
|
@@ -104,7 +104,7 @@ class Codebird | |
/** | ||
* The current Codebird version | ||
*/ | ||
protected $_version = '2.7.0'; | ||
protected $_version = '2.7.1'; | ||
|
||
/** | ||
* Auto-detect cURL absence | ||
|
@@ -716,7 +716,7 @@ protected function getCurlInitialization($url) | |
protected function getNoCurlInitialization($url, $contextOptions, $hostname = '') | ||
{ | ||
$httpOptions = array(); | ||
|
||
$httpOptions['header'] = array( | ||
'User-Agent: codebird-php ' . $this->getVersion() . ' by Jublo Solutions <[email protected]>' | ||
); | ||
|
@@ -1269,6 +1269,8 @@ protected function _buildMultipart($method, $params) | |
// use hardcoded download timeouts for now | ||
curl_setopt($ch, _CURLOPT_TIMEOUT_MS, 5000); | ||
curl_setopt($ch, _CURLOPT_CONNECTTIMEOUT_MS, 2000); | ||
// find files that have been redirected | ||
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); | ||
$result = curl_exec($ch); | ||
if ($result !== false) { | ||
$value = $result; | ||
|