summaryrefslogtreecommitdiff
path: root/lib/ssh.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-08-02 10:57:30 +0200
committerDaniel Stenberg <daniel@haxx.se>2016-08-04 00:26:01 +0200
commitbde2f09d5e4c4a3b2826aefdda0a10c07bbb551a (patch)
treed547dda6be69a0740afb2c8939ade8a2d3c3d7df /lib/ssh.c
parent6eb60c2dc589a15ff8a3aa5961745d86044a9b78 (diff)
downloadgnurl-bde2f09d5e4c4a3b2826aefdda0a10c07bbb551a.tar.gz
gnurl-bde2f09d5e4c4a3b2826aefdda0a10c07bbb551a.tar.bz2
gnurl-bde2f09d5e4c4a3b2826aefdda0a10c07bbb551a.zip
multi: make Curl_expire() work with 0 ms timeouts
Previously, passing a timeout of zero to Curl_expire() was a magic code for clearing all timeouts for the handle. That is now instead made with the new Curl_expire_clear() function and thus a 0 timeout is fine to set and will trigger a timeout ASAP. This will help removing short delays, in particular notable when doing HTTP/2.
Diffstat (limited to 'lib/ssh.c')
-rw-r--r--lib/ssh.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh.c b/lib/ssh.c
index 7bc313622..bf7cfe01b 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -1895,7 +1895,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
/* since we don't really wait for anything at this point, we want the
state machine to move on as soon as possible so we set a very short
timeout here */
- Curl_expire(data, 1);
+ Curl_expire(data, 0);
state(conn, SSH_STOP);
}