Merge branch '2.4' into develop

pull/6786/head
Alexandre Dulaunoy 2020-12-21 16:13:53 +01:00
commit 708f01e83a
No known key found for this signature in database
GPG Key ID: 09E2CD4944E6CBCD
1 changed files with 1 additions and 1 deletions

View File

@ -3927,7 +3927,7 @@ class Server extends AppModel
if ($this->testForEmpty($value) !== true) {
return $this->testForEmpty($value);
}
$regex = "/^(?<proto>https?):\/\/(?<host>([\w,\.]+))(?::(?<port>[0-9]+))?(?<base>\/[a-z0-9_\-\.]+)?$/i";
$regex = "/^(?<proto>https?):\/\/(?<host>([\w,\-,\.]+))(?::(?<port>[0-9]+))?(?<base>\/[a-z0-9_\-\.]+)?$/i";
if (
!preg_match($regex, $value, $matches) ||
strtolower($matches['proto']) != strtolower($this->getProto()) ||