--- a/src/lib/connection.c	Thu May 21 06:35:59 2015 -0400
+++ b/src/lib/connection.c	Thu May 21 08:38:56 2015 -0400
@@ -27,6 +27,7 @@
 {
 	const char *line;
 	struct istream *input;
+	struct ostream *output;
 	int ret = 0;
 
 	switch (connection_input_read(conn)) {
@@ -40,7 +41,12 @@
 	}
 
 	input = conn->input;
+	output = conn->output;
 	i_stream_ref(input);
+	if (output != NULL) {
+		o_stream_ref(output);
+		o_stream_cork(output);
+	}
 	while (!input->closed && (line = i_stream_next_line(input)) != NULL) {
 		T_BEGIN {
 			ret = conn->list->v.input_line(conn, line);
@@ -48,6 +54,10 @@
 		if (ret <= 0)
 			break;
 	}
+	if (output != NULL) {
+		o_stream_uncork(output);
+		o_stream_unref(&output);
+	}
 	if (ret < 0 && !input->closed) {
 		conn->disconnect_reason = CONNECTION_DISCONNECT_DEINIT;
 		conn->list->v.destroy(conn);