luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SSH: speedcheck clobbered existing error

Browse Source 
The just added speedcheck must not ruin the error code if already set
due to a problem.
This commit is contained in:
Daniel Stenberg 2011-01-06 00:19:17 +01:00
parent 651c0bcdf2
commit 53014175e8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ssh.c
View File

@ -2453,6 +2453,8 @@ static CURLcode ssh_easy_statemach(struct connectdata *conn,
long left; long left;
result = ssh_statemach_act(conn, &block); result = ssh_statemach_act(conn, &block);
if(result)
break;
if(Curl_pgrsUpdate(conn)) if(Curl_pgrsUpdate(conn))
return CURLE_ABORTED_BY_CALLBACK; return CURLE_ABORTED_BY_CALLBACK;
@ -2460,7 +2462,7 @@ static CURLcode ssh_easy_statemach(struct connectdata *conn,
struct timeval now = Curl_tvnow(); struct timeval now = Curl_tvnow();
result = Curl_speedcheck(data, now); result = Curl_speedcheck(data, now);
if(result) if(result)
return result; break;
} }
left = Curl_timeleft(data, NULL, duringconnect); left = Curl_timeleft(data, NULL, duringconnect);