From 2897ce7dc2e1b7e8c94e8fc79f6199c33efe7547 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Sat, 15 Dec 2012 15:31:38 +0100
Subject: pop3_doing: don't call pop3_dophase_done() if already failed

... it also clobbered the 'result' return value so that it wouldn't
return the error back to the parent function properly, which broke test
809 when run with 'multi-always'.
---
 lib/pop3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pop3.c b/lib/pop3.c
index 391f4e7b1..7fb4f5c35 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -1554,7 +1554,7 @@ static CURLcode pop3_doing(struct connectdata *conn, bool *dophase_done)
   CURLcode result;
   result = pop3_multi_statemach(conn, dophase_done);
 
-  if(*dophase_done) {
+  if(!result && *dophase_done) {
     result = pop3_dophase_done(conn, FALSE /* not connected */);
 
     DEBUGF(infof(conn->data, "DO phase is complete\n"));
-- 
cgit v1.2.3