bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #12986 from annando/exception

Browse source 
Handle exception on "head" / missing class variable added
This commit is contained in:
Tobias Diekershoff 2023-04-11 07:40:54 +02:00 committed by GitHub
parent a74bb57298 d1af85b27f
commit ae2e8beaac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Content/OEmbed.php
View file

@ -334,8 +334,8 @@ class OEmbed
$html_text = mb_convert_encoding($text, 'HTML-ENTITIES', mb_detect_encoding($text)); $html_text = mb_convert_encoding($text, 'HTML-ENTITIES', mb_detect_encoding($text));
// If it doesn't parse at all, just return the text. // If it doesn't parse at all, just return the text.
$dom = @DOMDocument::loadHTML($html_text); $dom = new DOMDocument();
if (!$dom) { if (!@$dom->loadHTML($html_text)) {
return $text; return $text;
} }
$xpath = new DOMXPath($dom); $xpath = new DOMXPath($dom);

1
src/Object/OEmbed.php
View file

@ -34,6 +34,7 @@ class OEmbed
public $type = ''; public $type = '';
public $title = ''; public $title = '';
public $description = '';
public $author_name = ''; public $author_name = '';
public $author_url = ''; public $author_url = '';
public $provider_name = ''; public $provider_name = '';

12
src/Util/Network.php
View file

@ -79,11 +79,19 @@ class Network
if (in_array(parse_url($url, PHP_URL_SCHEME), ['https', 'http'])) { if (in_array(parse_url($url, PHP_URL_SCHEME), ['https', 'http'])) {
$options = [HttpClientOptions::VERIFY => true, HttpClientOptions::TIMEOUT => $xrd_timeout]; $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. // 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])) { 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()) { if (!$curlResult->isSuccess()) {

7
src/Util/ParseUrl.php
View file

@ -70,7 +70,12 @@ class ParseUrl
$options = []; $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. // 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])) { if (!$curlResult->isSuccess() && ($curlResult->getReturnCode() >= 400) && !in_array($curlResult->getReturnCode(), [408, 504])) {