curl get requests support custom headers now, event to get content of thread output, shutdown function which saves world if server stopped with error

This commit is contained in:
GameHerobrine 2022-08-12 20:02:00 +03:00
parent 0088f2d86d
commit 4bd682b08e
5 changed files with 43 additions and 16 deletions

View file

@ -127,14 +127,28 @@ class Utils{
return Utils::$ip;
}
public static function curl_get($page, $timeout = 10){
public static function makeHeaders($json){
$arr = json_decode($json);
$rarr = [];
foreach ($arr as $key => $value){
$rarr[] = $key.": ".$value;
}
return $rarr;
}
public static function curl_get($page, $timeout = 10, $headers = " "){
if(Utils::$online === false){
return false;
}
if($headers != " "){
$headers = Utils::makeHeaders($headers);
}else{
$headers = ["User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:12.0) Gecko/20100101 Firefox/12.0 PocketMine-MP"];
}
$ch = curl_init($page);
curl_setopt($ch, CURLOPT_HTTPHEADER, ["User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:12.0) Gecko/20100101 Firefox/12.0 PocketMine-MP"]);
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
curl_setopt($ch, CURLOPT_AUTOREFERER, true);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);

View file

@ -8,7 +8,6 @@ class AsyncMultipleQueue extends Thread{
public $input;
public $output;
public $stop;
public function __construct(){
$this->input = "";
$this->output = "";
@ -24,8 +23,8 @@ class AsyncMultipleQueue extends Thread{
case ASYNC_CURL_GET:
$url = $this->get(Utils::readShort($this->get(2), false));
$timeout = Utils::readShort($this->get(2));
$res = (string) Utils::curl_get($url, $timeout);
$headers = $this->get(Utils::readShort($this->get(2), false));
$res = (string) Utils::curl_get($url, $timeout, $headers);
//$this->lock();
$this->output .= Utils::writeInt($rID) . Utils::writeShort(ASYNC_CURL_GET) . Utils::writeInt(strlen($res)) . $res;
//$this->unlock();