From 311476b5cb0d22356ab9a929a5c85d6f130bfd23 Mon Sep 17 00:00:00 2001
From: the-djmaze <3752035+the-djmaze@users.noreply.github.com>
Date: Tue, 3 Nov 2026 22:16:58 +0100
Subject: [PATCH] Catch hkps http errors as they can be ignored

---
 .../app/libraries/snappymail/pgp/keyservers.php  | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/keyservers.php b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/keyservers.php
index ab3c09b30..c938ede14 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/keyservers.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/keyservers.php
@@ -212,9 +212,19 @@ abstract class Keyservers
 		$b32 = new \SnappyMail\Base32('ybndrfg8ejkmcpqxot1uwisza345h769');
 		$keyid = $b32->encode(\sha1($localPart, true));
 
-		$oResponse = static::HTTP()->doRequest('GET', "https://openpgpkey.{$host}/.well-known/openpgpkey/{$host}/hu/{$keyid}");
-		if (!$oResponse || 200 !== $oResponse->status) {
-			$oResponse = static::HTTP()->doRequest('GET', "https://{$host}/.well-known/openpgpkey/hu/{$keyid}");
+		$oResponse = null;
+		try {
+			$oResponse = static::HTTP()->doRequest('GET', "https://openpgpkey.{$host}/.well-known/openpgpkey/{$host}/hu/{$keyid}");
+		} catch (\Throwable $e) {
+			\SnappyMail\Log::info('PGP', "WKD: {$e->getMessage()}");
+		}
+		if (200 !== $oResponse?->status) {
+			try {
+				$oResponse = static::HTTP()->doRequest('GET', "https://{$host}/.well-known/openpgpkey/hu/{$keyid}");
+			} catch (\Throwable $e) {
+				\SnappyMail\Log::info('PGP', "WKD: {$e->getMessage()}");
+				return false;
+			}
 		}
 		if (!$oResponse) {
 			\SnappyMail\Log::info('PGP', "No response for WKD key {$keyId} on {$host}");