dovecot-2.0-sslstream: QRESYNC: Fixed fallback handling to fetch...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0-sslstream/rev/183373d83021
changeset: 10106:183373d83021
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Oct 20 15:40:51 2009 -0400
description:
QRESYNC: Fixed fallback handling to fetching expunged UIDs (again).

diffstat:

1 file changed, 5 insertions(+), 3 deletions(-)
src/imap/imap-fetch.c |    8 +++++---

diffs (19 lines):

diff -r 5bdae566e0dc -r 183373d83021 src/imap/imap-fetch.c
--- a/src/imap/imap-fetch.c	Tue Oct 20 14:12:55 2009 -0400
+++ b/src/imap/imap-fetch.c	Tue Oct 20 15:40:51 2009 -0400
@@ -223,10 +223,12 @@ static int get_expunges_fallback(struct 
 							  next_uid,
 							  mail->uid - 1);
 			}
-			if (uid_filter[i].seq2 == mail->uid)
-				next_uid = uid_filter[++i].seq1;
+			if (uid_filter[i].seq2 != mail->uid)
+				next_uid = mail->uid + 1;
+			else if (++i < count)
+				next_uid = uid_filter[i].seq1;
 			else
-				next_uid = mail->uid + 1;
+				break;
 		}
 	}
 	if (i < count) {