dovecot-2.1: director: Don't delay reading input from remote con...

dovecot at dovecot.org dovecot at dovecot.org
Thu Apr 19 23:45:36 EEST 2012


details:   http://hg.dovecot.org/dovecot-2.1/rev/25c941423e42
changeset: 14438:25c941423e42
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Apr 19 23:45:31 2012 +0300
description:
director: Don't delay reading input from remote connection during handshake.

diffstat:

 src/director/director-connection.c |  4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diffs (21 lines):

diff -r 266521d59e2c -r 25c941423e42 src/director/director-connection.c
--- a/src/director/director-connection.c	Thu Apr 19 23:41:59 2012 +0300
+++ b/src/director/director-connection.c	Thu Apr 19 23:45:31 2012 +0300
@@ -1282,9 +1282,6 @@
 	user_directory_iter_deinit(&conn->user_iter);
 	director_connection_send(conn, "DONE\n");
 
-	i_assert(conn->io == NULL);
-	conn->io = io_add(conn->fd, IO_READ, director_connection_input, conn);
-
 	ret = o_stream_flush(conn->output);
 	timeout_reset(conn->to_ping);
 	return ret;
@@ -1365,6 +1362,7 @@
 				    director_connection_output, conn);
 
 	io_remove(&conn->io);
+	conn->io = io_add(conn->fd, IO_READ, director_connection_input, conn);
 
 	o_stream_cork(conn->output);
 	director_connection_send_handshake(conn);


More information about the dovecot-cvs mailing list