diff options
Diffstat (limited to 'lib/connect.c')
| -rw-r--r-- | lib/connect.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/connect.c b/lib/connect.c index b35c36c00..ca6e3466c 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -224,7 +224,12 @@ long Curl_timeleft(struct SessionHandle *data, } /* subtract elapsed time */ - timeout_ms -= Curl_tvdiff(*nowp, data->progress.t_startsingle); + if(duringconnect) + /* since this most recent connect started */ + timeout_ms -= Curl_tvdiff(*nowp, data->progress.t_startsingle); + else + /* since the entire operation started */ + timeout_ms -= Curl_tvdiff(*nowp, data->progress.t_startop); if(!timeout_ms) /* avoid returning 0 as that means no timeout! */ return -1; |