Changeset 4a63f1ef in github

Timestamp:

Sep 7, 2009 3:53:01 AM (4 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

eb4b147

Parents:

e077870a

Message:

• Fix roundcube hangs on empty inbox with bincimapd (#1486093)

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_imap.php (modified) (1 diff)
• program/lib/imap.inc (modified) (2 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix roundcube hangs on empty inbox with bincimapd (#1486093)
 - Fix wrong headers for IE on servers without $_SERVER['HTTPS'] (#1485926)
 - Force IE style headers for attachments in non-HTTPS session, 'use_https' option (#1485655)

program/include/rcube_imap.php

@@ -2229 +2229 @@
     $cache_count = count($cache_index);
 
-    // console("Cache check: $msg_count !== ".count($cache_index));
-
+    // empty mailbox
+    if (!$msg_count)
+      return $cache_count ? -2 : 1;
+    
     if ($cache_count==$msg_count) {
       if ($this->skip_deleted) {

program/lib/imap.inc

@@ -1511 +1511 @@
                                 $reslines = explode("\n", trim($m[1], '"'));
                                 // re-parse (see below)
-                                foreach ($reslines as $line) {
-                                        if (ord($line[0])<=32) {
-                                                $lines[$ln] .= (empty($lines[$ln])?'':"\n").trim($line);
+                                foreach ($reslines as $resln) {
+                                        if (ord($resln[0])<=32) {
+                                                $l[$ln] .= (empty($lines[$ln])?'':"\n").trim($resln);
                                         } else {
-                                                $lines[++$ln] = trim($line);
+                                                $lines[++$ln] = trim($resln);
                                         }
                                 }
@@ -1669 +1669 @@
                         }
                 }
-        } while (strcmp($a[0], $key) != 0);
+        } while (!iil_StartsWith($line, $key, true));
 
         return $result;