From cb2575185324f2e646f44ffae93ce1d6370ead1c Mon Sep 17 00:00:00 2001 From: Marcus Bointon Date: Mon, 28 Jun 2021 10:28:28 +0200 Subject: [PATCH] Minor tweak to MessageID regex, fixes #2388 --- src/PHPMailer.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/PHPMailer.php b/src/PHPMailer.php index 8489667f..25e94adb 100644 --- a/src/PHPMailer.php +++ b/src/PHPMailer.php @@ -2556,11 +2556,11 @@ class PHPMailer if ( '' !== $this->MessageID && preg_match( - '/^<((([a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~-]+(\.[a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~-]+)*)' . + '/^<((([a-z\d!#$%&\'*+\/=?^_`{|}~-]+(\.[a-z\d!#$%&\'*+\/=?^_`{|}~-]+)*)' . '|("(([\x01-\x08\x0B\x0C\x0E-\x1F\x7F]|[\x21\x23-\x5B\x5D-\x7E])' . - '|(\\[\x01-\x09\x0B\x0C\x0E-\x7F]))*"))@(([a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~-]+' . - '(\.[a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~-]+)*)|(\[(([\x01-\x08\x0B\x0C\x0E-\x1F\x7F]' . - '|[\x21-\x5A\x5E-\x7E])|(\\[\x01-\x09\x0B\x0C\x0E-\x7F]))*\])))>$/D', + '|(\\[\x01-\x09\x0B\x0C\x0E-\x7F]))*"))@(([a-z\d!#$%&\'*+\/=?^_`{|}~-]+' . + '(\.[a-z\d!#$%&\'*+\/=?^_`{|}~-]+)*)|(\[(([\x01-\x08\x0B\x0C\x0E-\x1F\x7F]' . + '|[\x21-\x5A\x5E-\x7E])|(\\[\x01-\x09\x0B\x0C\x0E-\x7F]))*\])))>$/Di', $this->MessageID ) ) {