mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-12 12:55:21 +00:00
Code Issues Projects Releases Wiki Activity

Added reference parameters for errors for Utils::getURL() and Utils::postURL(), close #332 (#357)

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-03-16 19:15:31 +00:00 committed by GitHub
parent 548df21645
commit bcbb5de5bb
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/updater/AutoUpdater.php
View File

@ -57,7 +57,13 @@ class AutoUpdater{
} }
protected function check(){ protected function check(){
$response = Utils::getURL($this->endpoint . "?channel=" . $this->getChannel(), 4); $error = "";
$response = Utils::getURL($this->endpoint . "?channel=" . $this->getChannel(), 4, [], $error);
if($error !== ""){
$this->server->getLogger()->debug("[AutoUpdater] Update check failed due to \"$error\"");
return;
}
$response = json_decode($response, true); $response = json_decode($response, true);
if(!is_array($response)){ if(!is_array($response)){
return; return;

20
src/pocketmine/utils/Utils.php
View File

@ -348,14 +348,16 @@ class Utils{
/** /**
* GETs an URL using cURL * GETs an URL using cURL
* NOTE: This is a blocking operation and can take a significant amount of time. It is inadvisable to use this method on the main thread.
* *
* @param $page * @param $page
* @param int $timeout default 10 * @param int $timeout default 10
* @param array $extraHeaders * @param array $extraHeaders
* @param string &$err Will be set to the output of curl_error(). Use this to retrieve errors that occured during the operation.
* *
* @return bool|mixed * @return bool|mixed false if an error occurred, mixed data if successful.
*/ */
public static function getURL($page, $timeout = 10, array $extraHeaders = []){ public static function getURL($page, $timeout = 10, array $extraHeaders = [], &$err = null){
if(Utils::$online === false){ if(Utils::$online === false){
return false; return false;
} }
@ -372,6 +374,7 @@ class Utils{
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, (int) $timeout); curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, (int) $timeout);
curl_setopt($ch, CURLOPT_TIMEOUT, (int) $timeout); curl_setopt($ch, CURLOPT_TIMEOUT, (int) $timeout);
$ret = curl_exec($ch); $ret = curl_exec($ch);
$err = curl_error($ch);
curl_close($ch); curl_close($ch);
return $ret; return $ret;
@ -379,15 +382,17 @@ class Utils{
/** /**
* POSTs data to an URL * POSTs data to an URL
* NOTE: This is a blocking operation and can take a significant amount of time. It is inadvisable to use this method on the main thread.
* *
* @param $page * @param $page
* @param array|string $args * @param array|string $args
* @param int $timeout * @param int $timeout
* @param array $extraHeaders * @param array $extraHeaders
* @param string &$err Will be set to the output of curl_error(). Use this to retrieve errors that occured during the operation.
* *
* @return bool|mixed * @return bool|mixed false if an error occurred, mixed data if successful.
*/ */
public static function postURL($page, $args, $timeout = 10, array $extraHeaders = []){ public static function postURL($page, $args, $timeout = 10, array $extraHeaders = [], &$err = null){
if(Utils::$online === false){ if(Utils::$online === false){
return false; return false;
} }
@ -406,6 +411,7 @@ class Utils{
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, (int) $timeout); curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, (int) $timeout);
curl_setopt($ch, CURLOPT_TIMEOUT, (int) $timeout); curl_setopt($ch, CURLOPT_TIMEOUT, (int) $timeout);
$ret = curl_exec($ch); $ret = curl_exec($ch);
$err = curl_error($ch);
curl_close($ch); curl_close($ch);
return $ret; return $ret;