From e66ffae856862afc2056986389e32da835b255ea Mon Sep 17 00:00:00 2001 From: dessert1 <2664162+dessert1@users.noreply.github.com> Date: Fri, 20 Mar 2020 19:12:33 +0100 Subject: [PATCH] Fix handling keyservers configured with protocol prefix (#7295) `|^[a-z]://|` matches only single-character protocol shortnames, to correctly exclude e.g. `hkps://` the expression should be `|^[a-z]+://|` instead. --- program/lib/Roundcube/rcube_config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/program/lib/Roundcube/rcube_config.php b/program/lib/Roundcube/rcube_config.php index 9bce9dd3e..814ff88dc 100644 --- a/program/lib/Roundcube/rcube_config.php +++ b/program/lib/Roundcube/rcube_config.php @@ -594,7 +594,7 @@ class rcube_config $list = (array) $this->prop['keyservers']; foreach ($list as $idx => $host) { - if (!preg_match('|^[a-z]://|', $host)) { + if (!preg_match('|^[a-z]+://|', $host)) { $host = "https://$host"; }