Merge branch '3.8RC'3.8

1 files changed, 8 insertions, 1 deletions

diff --git a/Zotlabs/Zot/Finger.php b/Zotlabs/Zot/Finger.php
index 348171bdc..77634777a 100644
--- a/Zotlabs/Zot/Finger.php
+++ b/Zotlabs/Zot/Finger.php
@@ -55,7 +55,7 @@ class Finger {
 
 		$r = q("select xchan.*, hubloc.* from xchan
 			left join hubloc on xchan_hash = hubloc_hash
-			where xchan_addr = '%s' and hubloc_primary = 1 limit 1",
+			where xchan_addr = '%s' and hubloc_primary = 1 and hubloc_deleted = 0 limit 1",
 			dbesc($xchan_addr)
 		);
 
@@ -71,6 +71,11 @@ class Finger {
 			$url = 'https://' . $host;
 		}
 
+		$m = parse_url($url);
+		if($m) {
+			$parsed_host = strtolower($m['host']);
+		}
+
 		$rhs = '/.well-known/zot-info';
 		$https = ((strpos($url,'https://') === 0) ? true : false);
 
@@ -88,6 +93,8 @@ class Finger {
 			$headers = [];
 			$headers['X-Zot-Channel'] = $channel['channel_address'] . '@' . \App::get_hostname();
 			$headers['X-Zot-Nonce']   = random_string();
+			$headers['Host']          = $parsed_host;
+
 			$xhead = \Zotlabs\Web\HTTPSig::create_sig('',$headers,$channel['channel_prvkey'],
 				'acct:' . $channel['channel_address'] . '@' . \App::get_hostname(),false);