Merge tag 'upstream/0.3' into debian

Upstream version 0.3

1 files changed, 14 insertions, 0 deletions

diff --git a/interimap b/interimap
index 150c754..7a36c4e 100755
--- a/interimap
+++ b/interimap
@@ -1088,6 +1088,18 @@ while (defined (my $row = $STH_LIST_INTERRUPTED->fetchrow_arrayref())) {
     # the _MODIFIED internal cache has been initialized with all our
     # UIDs.  (Since there is no reliable HIGHESTMODSEQ, any flag
     # difference is treated as a conflict.)
+    $STH_GET_CACHE_BY_IDX->execute($IDX);
+    if (defined (my $cache = $STH_GET_CACHE_BY_IDX->fetchrow_hashref())) {
+        $lIMAP->set_cache($cache->{mailbox},
+            UIDVALIDITY => $cache->{lUIDVALIDITY},
+            UIDNEXT     => $cache->{lUIDNEXT}
+        );
+        $rIMAP->set_cache($cache->{mailbox},
+            UIDVALIDITY => $cache->{rUIDVALIDITY},
+            UIDNEXT     => $cache->{rUIDNEXT}
+        );
+        die if defined $STH_GET_CACHE_BY_IDX->fetch(); # sanity check
+    }
     sync_messages($IDX, $MAILBOX, [keys %lList], [keys %rList]);
 }
 
@@ -1208,6 +1220,8 @@ while (1) {
         # we need to issue a NOOP command or go back to AUTH state since the
         # LIST command may not report the correct HIGHESTMODSEQ value for
         # the mailbox currently selected
+        # RFC3501: "The STATUS command MUST NOT be used as a "check for
+        #           new messages in the selected mailbox" operation"
         if (defined $MAILBOX) {
             # Prefer UNSELECT over NOOP commands as it requires a single command per cycle
             if ($lIMAP->incapable('UNSELECT') or $rIMAP->incapable('UNSELECT')) {