From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 5 Jan 2011 23:19:17 +0000 (+0100)
Subject: SSH: speedcheck clobbered existing error
X-Git-Tag: curl-7_21_4~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53014175e8dce8bc1ea6fbe00f1da886767d7587;p=curl

SSH: speedcheck clobbered existing error

The just added speedcheck must not ruin the error code if already set
due to a problem.
---

diff --git a/lib/ssh.c b/lib/ssh.c
index 58da9e629..646c9fc33 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -2453,6 +2453,8 @@ static CURLcode ssh_easy_statemach(struct connectdata *conn,
     long left;
 
     result = ssh_statemach_act(conn, &block);
+    if(result)
+      break;
 
     if(Curl_pgrsUpdate(conn))
       return CURLE_ABORTED_BY_CALLBACK;
@@ -2460,7 +2462,7 @@ static CURLcode ssh_easy_statemach(struct connectdata *conn,
       struct timeval now = Curl_tvnow();
       result = Curl_speedcheck(data, now);
       if(result)
-        return result;
+        break;
     }
 
     left = Curl_timeleft(data, NULL, duringconnect);