Commit 2111c2ed authored by Shao Shuchao's avatar Shao Shuchao Committed by Daniel Stenberg
Browse files

ConnectionDone: default maxconnects to 4 x number of easy handles 

... as documented!
parent 1f60728f

lib/multi.c

+3 −0
Original line number Diff line number Diff line
@@ -317,6 +317,9 @@ struct Curl_multi *Curl_multi_handle(int hashsize, /* socket hash */ 
  multi->closure_handle->state.conn_cache = multi->conn_cache;



  multi->max_pipeline_length = 5;



  /* -1 means it not set by user, use the default value */

  multi->maxconnects = -1;

  return (CURLM *) multi;



  error:

lib/url.c

+2 −1
Original line number Diff line number Diff line
@@ -3190,7 +3190,8 @@ ConnectionDone(struct SessionHandle *data, struct connectdata *conn) 
{

  /* data->multi->maxconnects can be negative, deal with it. */

  size_t maxconnects =

    (data->multi->maxconnects < 0) ? 0 : data->multi->maxconnects;

    (data->multi->maxconnects < 0) ? data->multi->num_easy * 4:

    data->multi->maxconnects;

  struct connectdata *conn_candidate = NULL;



  /* Mark the current connection as 'unused' */