From ad19f95f15bac425c1b37a7a260025d8fc9fe63c Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 7 May 2007 07:07:55 +0000 Subject: James Bursa fixed a bug in the multi handle code that made the connection cache grow a bit too much, beyond the normal 4 * easy_handles. --- CHANGES | 4 ++++ RELEASE-NOTES | 3 ++- lib/multi.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 9bb85484d..b65146303 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,10 @@ Changelog +Daniel S (7 May 2007) +- James Bursa fixed a bug in the multi handle code that made the connection + cache grow a bit too much, beyond the normal 4 * easy_handles. + Daniel S (2 May 2007) - Anders Gustafsson remarked that requiring CURLOPT_HTTP_VERSION set to 1.0 when CURLOPT_HTTP200ALIASES is used to avoid the problem mentioned below is diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 866fe9e4c..bb94edfc0 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -37,6 +37,7 @@ This release includes the following bugfixes: o curl_multi_socket() not "noticing" newly added handles o lack of Content-Length and chunked encoding now requires HTTP 1.1 as well to be treated as without response body + o connection cache growth in multi handles This release includes the following known bugs: @@ -61,6 +62,6 @@ advice from friends like these: Song Ma, Dan Fandrich, Yang Tse, Jay Austin, Robert Iakobashvil, James Housley, Daniel Black, Steve Little, Sonia Subramanian, Peter O'Gorman, Frank Hempel, Michael Wallner, Jeff Pohlmeyer, Tobias Rundström, - Anders Gustafsson + Anders Gustafsson, James Bursa Thanks! (and sorry if I forgot to mention someone) diff --git a/lib/multi.c b/lib/multi.c index c61958ea4..d9d7eb290 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -485,7 +485,7 @@ CURLMcode curl_multi_add_handle(CURLM *multi_handle, the shared cache every single easy handle had 5 entries in their cache by default. */ CURLcode res = Curl_ch_connc(easy_handle, multi->connc, - multi->connc->num*4); + multi->num_easy * 4); if(res != CURLE_OK) /* TODO: we need to do some cleaning up here! */ return CURLM_OUT_OF_MEMORY; -- cgit v1.2.3