clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13100 from MrPetovan/bug/fatal-errors 

Wrap HTTP client call in try catch in Network\Probe
This commit is contained in:
Michael Vogel 2023-05-07 12:27:27 +02:00 committed by GitHub
parent 46d3778ee8 bce7e85e1f
commit b5de664ef6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Network/Probe.php
View File

@ -952,9 +952,17 @@ class Probe
*/ */
public static function webfinger(string $url, string $type): array public static function webfinger(string $url, string $type): array
{ {
$xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20); try {
$curlResult = DI::httpClient()->get(
$url,
$type,
[HttpClientOptions::TIMEOUT => DI::config()->get('system', 'xrd_timeout', 20)]
);
} catch (\Throwable $e) {
Logger::notice($e->getMessage(), ['url' => $url, 'type' => $type, 'class' => get_class($e)]);
return [];
}
$curlResult = DI::httpClient()->get($url, $type, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
if ($curlResult->isTimeout()) { if ($curlResult->isTimeout()) {
self::$isTimeout = true; self::$isTimeout = true;
return []; return [];