summaryrefslogtreecommitdiff
path: root/lib/conncache.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2015-05-18 08:56:29 +0200
committerDaniel Stenberg <daniel@haxx.se>2015-05-18 09:33:36 +0200
commit38bd6bf0bb4ffc031c8d810f103d6ec1bc7fbb90 (patch)
tree54cb3a02e93e86065a7d4854cc0441c18ac4083c /lib/conncache.c
parentbe4c8fd1ef11a565fcfceed48d40aa9889f095d4 (diff)
downloadcurl-38bd6bf0bb4ffc031c8d810f103d6ec1bc7fbb90.tar.gz
bundles: store no/default/pipeline/multiplex
to allow code to act differently on the situation. Also added some more info message for the connection re-use function to make it clearer when connections are not re-used.
Diffstat (limited to 'lib/conncache.c')
-rw-r--r--lib/conncache.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/conncache.c b/lib/conncache.c
index 5496f097c..634b673e3 100644
--- a/lib/conncache.c
+++ b/lib/conncache.c
@@ -56,7 +56,7 @@ static CURLcode bundle_create(struct SessionHandle *data,
return CURLE_OUT_OF_MEMORY;
(*cb_ptr)->num_connections = 0;
- (*cb_ptr)->server_supports_pipelining = FALSE;
+ (*cb_ptr)->multiuse = BUNDLE_UNKNOWN;
(*cb_ptr)->conn_list = Curl_llist_alloc((curl_llist_dtor) conn_llist_dtor);
if(!(*cb_ptr)->conn_list) {
@@ -205,10 +205,8 @@ CURLcode Curl_conncache_add_conn(struct conncache *connc,
return result;
key = hashkey(conn);
- if(!key) {
- bundle_destroy(new_bundle);
+ if(!key)
return CURLE_OUT_OF_MEMORY;
- }
rc = conncache_add_bundle(data->state.conn_cache, key, new_bundle);
free(key);