Commit 3af696f7 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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().
parent 09cee163

lib/transfer.c

+6 −0
Original line number Diff line number Diff line
@@ -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;

}