diff options
author | Shao Shuchao <sshao@websense.com> | 2014-02-17 13:44:00 +0800 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2014-02-17 09:29:25 +0100 |
commit | 2111c2ed0754a3f7849ac85606225579fae6075d (patch) | |
tree | 0463a1056eeb48594be9664add432ef510a6e244 /lib | |
parent | 1f60728f8125710f5a526560411bc5cd205c769c (diff) |
ConnectionDone: default maxconnects to 4 x number of easy handles
... as documented!
Diffstat (limited to 'lib')
-rw-r--r-- | lib/multi.c | 3 | ||||
-rw-r--r-- | lib/url.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/multi.c b/lib/multi.c index b3b571612..02d225759 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -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: @@ -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' */ |