dovecot-2.2: lib-imap-client: Don't send NOOP if we're still wai...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/3937b2e39963
changeset: 16968:3937b2e39963
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Nov 17 01:01:50 2013 +0200
description:
lib-imap-client: Don't send NOOP if we're still waiting for a command reply.

diffstat:

 src/lib-imap-client/imapc-connection.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (21 lines):

diff -r f80bd0ace609 -r 3937b2e39963 src/lib-imap-client/imapc-connection.c
--- a/src/lib-imap-client/imapc-connection.c	Sun Nov 17 00:59:39 2013 +0200
+++ b/src/lib-imap-client/imapc-connection.c	Sun Nov 17 01:01:50 2013 +0200
@@ -1301,10 +1301,14 @@
 {
 	struct imapc_command *cmd;
 
-	if (!conn->idling)
+	if (conn->idling)
+		cmd = imapc_connection_cmd(conn, imapc_reidle_callback, conn);
+	else if (array_count(&conn->cmd_wait_list) == 0)
 		cmd = imapc_connection_cmd(conn, imapc_noop_callback, NULL);
-	else
-		cmd = imapc_connection_cmd(conn, imapc_reidle_callback, conn);
+	else {
+		/* IMAP command reply is taking a long time */
+		return;
+	}
 	imapc_command_send(cmd, "NOOP");
 }