changeset 12294:b8803a1e2dc2

pop3: Recent corking change caused hangs.
author Timo Sirainen <tss@iki.fi>
date Sat, 16 Oct 2010 18:33:42 +0100
parents 794f09e5571d
children 00637db0e54c
files src/pop3/pop3-client.c
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/pop3/pop3-client.c	Sat Oct 16 00:49:35 2010 +0100
+++ b/src/pop3/pop3-client.c	Sat Oct 16 18:33:42 2010 +0100
@@ -667,7 +667,15 @@
 	}
 
 	o_stream_uncork(client->output);
-	return client->cmd == NULL;
+	if (client->cmd != NULL) {
+		/* command not finished yet */
+		return 0;
+	} else if (client->io == NULL) {
+		/* data still in output buffer, get back here to add IO */
+		return 0;
+	} else {
+		return 1;
+	}
 }
 
 void clients_destroy_all(void)