Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-30 09:04:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Handle exception on "head" / missing class variable added

Browse source
This commit is contained in:
Michael 2023-04-11 02:11:39 +00:00
parent a74bb57298
commit d1af85b27f
4 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Util/Network.php
View file

@ -79,11 +79,19 @@ class Network
if (in_array(parse_url($url, PHP_URL_SCHEME), ['https', 'http'])) {
$options = [HttpClientOptions::VERIFY => true, HttpClientOptions::TIMEOUT => $xrd_timeout];
$curlResult = DI::httpClient()->head($url, $options);
try {
$curlResult = DI::httpClient()->head($url, $options);
} catch (\Exception $e) {
return false;
}
// Workaround for systems that can't handle a HEAD request. Don't retry on timeouts.
if (!$curlResult->isSuccess() && ($curlResult->getReturnCode() >= 400) && !in_array($curlResult->getReturnCode(), [408, 504])) {
$curlResult = DI::httpClient()->get($url, HttpClientAccept::DEFAULT, $options);
try {
$curlResult = DI::httpClient()->get($url, HttpClientAccept::DEFAULT, $options);
} catch (\Exception $e) {
return false;
}
}
if (!$curlResult->isSuccess()) {

7
src/Util/ParseUrl.php
View file

@ -70,7 +70,12 @@ class ParseUrl
$options = [];
}
$curlResult = DI::httpClient()->head($url, array_merge([HttpClientOptions::ACCEPT_CONTENT => $accept], $options));
try {
$curlResult = DI::httpClient()->head($url, array_merge([HttpClientOptions::ACCEPT_CONTENT => $accept], $options));
} catch (\Exception $e) {
DI::logger()->debug('Got exception', ['url' => $url, 'message' => $e->getMessage()]);
return [];
}
// Workaround for systems that can't handle a HEAD request. Don't retry on timeouts.
if (!$curlResult->isSuccess() && ($curlResult->getReturnCode() >= 400) && !in_array($curlResult->getReturnCode(), [408, 504])) {