summaryrefslogtreecommitdiff
path: root/roundcubemail/program
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-12-02 07:51:07 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-12-02 07:51:07 +0000
commit0ecc3784d6bd9161a71d91521fa593815220ce0c (patch)
tree80a9edfa9636803f99b9caaa5ee79f1925e5d4fc /roundcubemail/program
parent0181c2c573613b6a1ee874b926291515b75a9c8f (diff)
- Improved handling of some malformed values encoded with quoted-printable (#1488232)
git-svn-id: https://svn.roundcube.net/trunk@5525 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
-rw-r--r--roundcubemail/program/include/rcube_imap.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php
index 50656f28c..c4175cbed 100644
--- a/roundcubemail/program/include/rcube_imap.php
+++ b/roundcubemail/program/include/rcube_imap.php
@@ -4164,7 +4164,7 @@ class rcube_imap
$input = preg_replace("/\?=\s+=\?/", '?==?', $input);
// encoded-word regexp
- $re = '/=\?([^?]+)\?([BbQq])\?([^?\n]*)\?=/';
+ $re = '/=\?([^?]+)\?([BbQq])\?([^\n]*?)\?=/';
// Find all RFC2047's encoded words
if (preg_match_all($re, $input, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {