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

Internet: explicitly assume return of curl_exec() is string after error checking

Browse Source 
this is documented as string|bool, but it's actually string|false if CURLOPT_RETURNTRANSFER is set, and bool if not.
This commit is contained in:
Dylan K. Taylor 2020-04-15 12:02:38 +01:00
parent d246933e3e
commit 0c9d16f1ef
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/utils/Internet.php
View File

@ -227,10 +227,10 @@ class Internet{
]); ]);
try{ try{
$raw = curl_exec($ch); $raw = curl_exec($ch);
$error = curl_error($ch); if($raw === false){
if($error !== ""){ throw new InternetException(curl_error($ch));
throw new InternetException($error);
} }
if(!is_string($raw)) throw new AssumptionFailedError("curl_exec() should return string|false when CURLOPT_RETURNTRANSFER is set");
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE); $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
$headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE); $headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
$rawHeaders = substr($raw, 0, $headerSize); $rawHeaders = substr($raw, 0, $headerSize);