From 60df79ad2a89afa33b383188e9c0b3f813027edc Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 29 Dec 2019 03:27:54 +0000
Subject: [PATCH] Probe: Additional checks for connection problems

---
 src/Network/Probe.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 878198504d..fac76e0dac 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -115,6 +115,7 @@ class Probe
 		$xrd = null;
 
 		$curlResult = Network::curl($ssl_url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+		$ssl_connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
 		if ($curlResult->isSuccess()) {
 			$xml = $curlResult->getBody();
 			$xrd = XML::parseString($xml, false);
@@ -127,11 +128,16 @@ class Probe
 
 		if (!is_object($xrd)) {
 			$curlResult = Network::curl($url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+			$connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
 			if ($curlResult->isTimeout()) {
 				Logger::info('Probing timeout', ['url' => $url], Logger::DEBUG);
 				self::$istimeout = true;
 				return false;
+			} elseif ($connection_error && $ssl_connection_error) {
+				self::$istimeout = true;
+				return false;
 			}
+
 			$xml = $curlResult->getBody();
 			$xrd = XML::parseString($xml, false);
 			$host_url = 'http://'.$host;