projects
/
platform
/
upstream
/
curl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
651c0bc
)
SSH: speedcheck clobbered existing error
author
Daniel Stenberg
<daniel@haxx.se>
Wed, 5 Jan 2011 23:19:17 +0000
(
00:19
+0100)
committer
Daniel Stenberg
<daniel@haxx.se>
Wed, 5 Jan 2011 23:19:17 +0000
(
00:19
+0100)
The just added speedcheck must not ruin the error code if already set
due to a problem.
lib/ssh.c
patch
|
blob
|
history
diff --git
a/lib/ssh.c
b/lib/ssh.c
index
58da9e6
..
646c9fc
100644
(file)
--- 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);