[Svn] r4479 - in trunk/roundcubemail: . program/include

trac at roundcube.net trac at roundcube.net
Wed Feb 2 12:55:16 CET 2011


Author: alec
Date: 2011-02-02 05:55:16 -0600 (Wed, 02 Feb 2011)
New Revision: 4479

Modified:
   trunk/roundcubemail/CHANGELOG
   trunk/roundcubemail/program/include/rcube_imap_generic.php
Log:
- Fix parsing FETCH response for very long headers (#1487753)


Modified: trunk/roundcubemail/CHANGELOG
===================================================================
--- trunk/roundcubemail/CHANGELOG	2011-02-01 10:06:53 UTC (rev 4478)
+++ trunk/roundcubemail/CHANGELOG	2011-02-02 11:55:16 UTC (rev 4479)
@@ -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)

Modified: trunk/roundcubemail/program/include/rcube_imap_generic.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_imap_generic.php	2011-02-01 10:06:53 UTC (rev 4478)
+++ trunk/roundcubemail/program/include/rcube_imap_generic.php	2011-02-02 11:55:16 UTC (rev 4479)
@@ -1494,7 +1494,7 @@
                 // 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 @@
 
                     // 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);
                         }

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list