Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-24 16:40:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8398 from annando/issue-8383-2

Browse source 
Issue 8383 (again): Finally fixes the double scheme problem
This commit is contained in:
Hypolite Petovan 2020-03-10 10:17:04 -04:00 committed by GitHub
commit 280c508599
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Network/Probe.php
View file

@ -161,7 +161,11 @@ class Probe
if ($curlResult->isSuccess()) { if ($curlResult->isSuccess()) {
$xml = $curlResult->getBody(); $xml = $curlResult->getBody();
$xrd = XML::parseString($xml, false); $xrd = XML::parseString($xml, false);
if (!empty($url)) {
$host_url = 'https://' . $host; $host_url = 'https://' . $host;
} else {
$host_url = $host;
}
} elseif ($curlResult->isTimeout()) { } elseif ($curlResult->isTimeout()) {
Logger::info('Probing timeout', ['url' => $ssl_url], Logger::DEBUG); Logger::info('Probing timeout', ['url' => $ssl_url], Logger::DEBUG);
self::$istimeout = true; self::$istimeout = true;