summaryrefslogtreecommitdiff
path: root/lib/vtls/gtls.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-07-29 16:35:09 +0200
committerDaniel Stenberg <daniel@haxx.se>2017-07-29 16:35:09 +0200
commit0bd2d077afbac413d52980a943cf4ac241956a7a (patch)
treed0bb92cbcc2fe85c2fb1f9e13df2b76be28cf8f9 /lib/vtls/gtls.c
parent171f8ded26d2845ef358c62f6e95ec34468349ae (diff)
downloadcurl-bagder/now-remade.tar.gz
now: update 'now' as part of the easy handle instead of local variablesbagder/now-remade
... as the mix of both passing in current time and figuring it out locally sometimes made "now" move in time in unexpected ways. Curl_timeleft() got an updated prototype. The old defines for Curl_tvnow() and Curl_tvdiff() are now removed. Renamed the conn->new member to setup_time and fixed its use somewhat. Moved the 'now' field from the SingleRequest struct within the easy handle to the struct UrlState.
Diffstat (limited to 'lib/vtls/gtls.c')
-rw-r--r--lib/vtls/gtls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
index d55f995e8..0a9bd01ad 100644
--- a/lib/vtls/gtls.c
+++ b/lib/vtls/gtls.c
@@ -285,7 +285,7 @@ static CURLcode handshake(struct connectdata *conn,
for(;;) {
/* check allowed time left */
- timeout_ms = Curl_timeleft(data, NULL, duringconnect);
+ timeout_ms = Curl_timeleft(data, duringconnect);
if(timeout_ms < 0) {
/* no need to continue if time already is up */