diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-02-02 11:55:16 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-02-02 11:55:16 +0000 |
| commit | 4a3224def91fbe87ad002a7fcc764c27f02232c4 (patch) | |
| tree | 412d8d20e989032b04adc0d4976d7abc2bac3a52 | |
| parent | 2fda79ff797e5e10270e4c85a846bb1dbe27b982 (diff) | |
- Fix parsing FETCH response for very long headers (#1487753)
git-svn-id: https://svn.roundcube.net/trunk@4479 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_imap_generic.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 28d361a1f..d13a99a79 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix parsing FETCH response for very long headers (#1487753) - Fix add/remove columns in message list when message_sort_order isn't set (#1487751) - Check mime headers before attempt to parse them (#1487745) - Quote header values in show_additional_headers plugin (#1487744) diff --git a/roundcubemail/program/include/rcube_imap_generic.php b/roundcubemail/program/include/rcube_imap_generic.php index b4f01a9e2..e8b1fd4b4 100644 --- a/roundcubemail/program/include/rcube_imap_generic.php +++ b/roundcubemail/program/include/rcube_imap_generic.php @@ -1494,7 +1494,7 @@ class rcube_imap_generic // INTERNALDATE "16-Nov-2008 21:08:46 +0100" BODYSTRUCTURE (...) // BODY[HEADER.FIELDS ... - if (preg_match('/^\* [0-9]+ FETCH \((.*) BODY/s', $line, $matches)) { + if (preg_match('/^\* [0-9]+ FETCH \((.*) BODY/sU', $line, $matches)) { $str = $matches[1]; // swap parents with quotes, then explode @@ -1531,7 +1531,7 @@ class rcube_imap_generic // BODYSTRUCTURE if ($bodystr) { - while (!preg_match('/ BODYSTRUCTURE (.*) BODY\[HEADER.FIELDS/s', $line, $m)) { + while (!preg_match('/ BODYSTRUCTURE (.*) BODY\[HEADER.FIELDS/sU', $line, $m)) { $line2 = $this->readLine(1024); $line .= $this->multLine($line2, true); } |