lib-imap-client: Fix IO after enabling SSL

io_add_istream() needs to be used with the SSL istream, otherwise it can
cause hangs.

diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c
index 94ba96d56bdcb0d88309d747c42ac715b7b5b9bc..264a05a0cccc0185225e891aa855a8957428e015 100644 (file)
--- a/src/lib-imap-client/imapc-connection.c
+++ b/src/lib-imap-client/imapc-connection.c
@@ -1668,6 +1668,7 @@ static int imapc_connection_ssl_init(struct imapc_connection *conn)
                conn->output = conn->raw_output;
        }
 
+       io_remove(&conn->io);
        if (io_stream_create_ssl_client(conn->client->ssl_ctx,
                                        conn->client->set.host,
                                        &ssl_set, &conn->input, &conn->output,
@@ -1676,6 +1677,7 @@ static int imapc_connection_ssl_init(struct imapc_connection *conn)
                        conn->name, error);
                return -1;
        }
+       conn->io = io_add_istream(conn->input, imapc_connection_input, conn);
        ssl_iostream_set_handshake_callback(conn->ssl_iostream,
                                            imapc_connection_ssl_handshaked,
                                            conn);