From 53014175e8dce8bc1ea6fbe00f1da886767d7587 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 6 Jan 2011 00:19:17 +0100 Subject: [PATCH] SSH: speedcheck clobbered existing error The just added speedcheck must not ruin the error code if already set due to a problem. --- lib/ssh.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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);