summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-05-10 09:35:24 +0200
committerAleksander Machniak <alec@alec.pl>2013-05-10 09:37:25 +0200
commitbde85428d69069637782d9507475df78890f08d0 (patch)
tree134efa1bc2a51ec69b9f0c8778dd2722b477d972 /program/lib
parent71ec1b6063378c684c6db9b2b63475d52e0ac165 (diff)
Fix handling of invalid email addresses in headers (#1489092)
Conflicts: CHANGELOG program/steps/mail/func.inc
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/Roundcube/rcube_mime.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php
index 63549fbec..596828814 100644
--- a/program/lib/Roundcube/rcube_mime.php
+++ b/program/lib/Roundcube/rcube_mime.php
@@ -361,6 +361,11 @@ class rcube_mime
$address = $m[1];
$name = '';
}
+ // special case (#1489092)
+ else if (preg_match('/(\s*<MAILER-DAEMON>)$/', $val, $m)) {
+ $address = 'MAILER-DAEMON';
+ $name = substr($val, 0, -strlen($m[1]));
+ }
else {
$name = $val;
}