X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=a0887d5cba877cb5187acccdf6c09017c261b1a6;hb=e1863951986ba5be173758324a00652bc5af870c;hp=2b5cc3cff7d02a7cdcaa0209d14813ca37524cde;hpb=d0b8d78cad8e8defe1799b9a674bc49f7c58f9a1;p=friendica.git

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 2b5cc3cff7..a0887d5cba 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -415,14 +415,19 @@ class Probe
 			}
 		}
 
-		if (!empty($data['baseurl']) && empty($data['gsid'])) {
-			$data['gsid'] = GServer::getID($data['baseurl']);
-		}
-
 		if (empty($data['network'])) {
 			$data['network'] = Protocol::PHANTOM;
 		}
 
+		$baseurl = parse_url($data['url'], PHP_URL_SCHEME) . '://' . parse_url($data['url'], PHP_URL_HOST);
+		if (empty($data['baseurl']) && ($data['network'] == Protocol::ACTIVITYPUB) && (rtrim($data['url'], '/') == $baseurl)) {
+			$data['baseurl'] = $baseurl;
+		}
+
+		if (!empty($data['baseurl']) && empty($data['gsid'])) {
+			$data['gsid'] = GServer::getID($data['baseurl']);
+		}	
+
 		// Ensure that local connections always are DFRN
 		if (($network == '') && ($data['network'] != Protocol::PHANTOM) && (self::ownHost($data['baseurl'] ?? '') || self::ownHost($data['url']))) {
 			$data['network'] = Protocol::DFRN;