dovecot-2.2: pop3-migration: Avoid disconnection from POP3 serve...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/ab6a4455b27d
changeset: 14835:ab6a4455b27d
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Aug 03 17:39:54 2012 +0300
description:
pop3-migration: Avoid disconnection from POP3 server due to idling.

diffstat:

 src/plugins/pop3-migration/pop3-migration-plugin.c |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (18 lines):

diff -r 476381017ec7 -r ab6a4455b27d src/plugins/pop3-migration/pop3-migration-plugin.c
--- a/src/plugins/pop3-migration/pop3-migration-plugin.c	Wed Aug 01 23:14:19 2012 +0300
+++ b/src/plugins/pop3-migration/pop3-migration-plugin.c	Fri Aug 03 17:39:54 2012 +0300
@@ -472,8 +472,13 @@
 
 	if (pop3_mailbox_open(box->storage) < 0)
 		return -1;
+	/* the POP3 server isn't connected to yet. handle all IMAP traffic
+	   first before connecting, so POP3 server won't disconnect us due to
+	   idling. */
+	if (imap_map_read(box) < 0)
+		return -1;
 
-	if (pop3_map_read(box->storage) < 0 || imap_map_read(box) < 0)
+	if (pop3_map_read(box->storage) < 0)
 		return -1;
 
 	if (!pop3_uidl_assign_by_size(box)) {