From 3af696f7c444a32cdd9e183a4ed0b543f09fef86 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 29 Aug 2010 00:16:34 +0200 Subject: [PATCH] multi: set timeouts when transfer begins When a new transfer is about to start we now set the proper timeouts to expire for the multi interface if they are set for the handle. This is a follow-up bugfix to make sure that easy handles timeout properly when the times expire and the multi interface is used. This also improves curl_multi_timeout(). --- lib/transfer.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/transfer.c b/lib/transfer.c index 99a62610b..71fb3961e 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -1433,6 +1433,12 @@ CURLcode Curl_pretransfer(struct SessionHandle *data) Curl_initinfo(data); /* reset session-specific information "variables" */ Curl_pgrsStartNow(data); + if(data->set.timeout) + Curl_expire(data, data->set.timeout); + + if(data->set.connecttimeout) + Curl_expire(data, data->set.connecttimeout); + return CURLE_OK; }