[dovecot-cvs] dovecot/src/imap cmd-append.c, 1.73, 1.74 imap-sync.c, 1.16, 1.17

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/imap
In directory talvi:/tmp/cvs-serv20821

Modified Files:
	cmd-append.c imap-sync.c 
Log Message:
And one more fix for append hang..



Index: cmd-append.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap/cmd-append.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- cmd-append.c	28 Jan 2006 11:32:10 -0000	1.73
+++ cmd-append.c	29 Jan 2006 12:33:13 -0000	1.74
@@ -126,8 +126,6 @@
 		mailbox_close(&ctx->box);
 
 	ctx->client->bad_counter = 0;
-	/* reset command so that flush callback gets changed back to normal. */
-	_client_reset_command(ctx->client);
 }
 
 static bool cmd_append_continue_cancel(struct client_command_context *cmd)

Index: imap-sync.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap/imap-sync.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- imap-sync.c	14 Jan 2006 18:47:21 -0000	1.16
+++ imap-sync.c	29 Jan 2006 12:33:13 -0000	1.17
@@ -216,6 +216,10 @@
 		return TRUE;
 	}
 
+	/* make sure that flush callback gets set to normal. this is
+	   currently needed only with APPEND. */
+	_client_reset_command(cmd->client);
+
 	if ((client_workarounds & WORKAROUND_DELAY_NEWMAIL) != 0 &&
 	    (flags & MAILBOX_SYNC_FLAG_FAST) != 0) {
 		/* expunges might break just as badly as new mail