pop3: Recent corking change caused hangs.

diff --git a/src/pop3/pop3-client.c b/src/pop3/pop3-client.c
index 63d7361d0a37199eec4db920f6c294be777290ff..66d4eb17eef0458f35399d3e60018306a979555b 100644 (file)
--- a/src/pop3/pop3-client.c
+++ b/src/pop3/pop3-client.c
@@ -667,7 +667,15 @@ static int client_output(struct client *client)
        }
 
        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)