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

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

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);
$host_url = 'https://'.$host; if (!empty($url)) {
$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;