diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-06-08 08:34:32 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-06-08 10:50:47 +0200 |
| commit | 7fffe97b787b962fc0afcd5737cec411f2bc0023 (patch) | |
| tree | 7d184eea0449a79a51bd2367c9b4da96228a98f4 /lib/connect.c | |
| parent | 165b7f50991277699fc7dc4758ec7f501372a75a (diff) | |
| download | curl-7fffe97b787b962fc0afcd5737cec411f2bc0023.tar.gz | |
expire: remove Curl_expire_latest()
With the introduction of expire IDs and the fact that existing timers
can be removed now and thus never expire, the concept with adding a
"latest" timer is not working anymore as it risks to not expire at all.
So, to be certain the timers actually are in line and will expire, the
plain Curl_expire() needs to be used. The _latest() function was added
as a sort of shortcut in the past that's quite simply not necessary
anymore.
Follow-up to 31b39c40cf90
Reported-by: Paul Harris
Closes #1555
Diffstat (limited to 'lib/connect.c')
| -rw-r--r-- | lib/connect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/connect.c b/lib/connect.c index de84daa4f..d4fd52b99 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -1070,7 +1070,7 @@ static CURLcode singleipconnect(struct connectdata *conn, conn->connecttime = Curl_tvnow(); if(conn->num_addr > 1) - Curl_expire_latest(data, conn->timeoutms_per_addr, EXPIRE_DNS_PER_NAME); + Curl_expire(data, conn->timeoutms_per_addr, EXPIRE_DNS_PER_NAME); /* Connect TCP sockets, bind UDP */ if(!isconnected && (conn->socktype == SOCK_STREAM)) { |