changeset 14474:25c941423e42

director: Don't delay reading input from remote connection during handshake.
author Timo Sirainen <tss@iki.fi>
date Thu, 19 Apr 2012 23:45:31 +0300
parents 266521d59e2c
children 9ef4dee0792f
files src/director/director-connection.c
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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);