summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-08-14 11:09:38 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-08-14 11:09:38 +0000
commitf310872f808cf4a76dccf9e87b2cdc724a1b9cdc (patch)
tree46dfa168cf596c37f652c8e1b65ce43d377fe744
parent25cb0add9651e280e51bcbd616fc7d8faef8fedf (diff)
Better fix for skipping untagged responses; should also work with long body structres (#1485261)
git-svn-id: https://svn.roundcube.net/trunk@1646 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/program/lib/imap.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/lib/imap.inc b/roundcubemail/program/lib/imap.inc
index da709faf3..42aa0fa61 100644
--- a/roundcubemail/program/lib/imap.inc
+++ b/roundcubemail/program/lib/imap.inc
@@ -2575,8 +2575,8 @@ function iil_C_FetchStructureString(&$conn, $folder, $id) {
do {
$line = iil_ReadLine($fp, 5000);
$line = iil_MultLine($fp, $line);
- list(, $index, $rest) = explode(' ', $line);
- if ($index == $id || preg_match("/^$key/", $line))
+ list(, $index, $cmd, $rest) = explode(' ', $line);
+ if ($cmd != 'FETCH' || $index == $id)
$result .= $line;
} while (!preg_match("/^$key/", $line));