diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/conncache.c | 16 | ||||
| -rw-r--r-- | lib/conncache.h | 6 | ||||
| -rw-r--r-- | lib/url.c | 9 |
3 files changed, 17 insertions, 14 deletions
diff --git a/lib/conncache.c b/lib/conncache.c index fcfb15015..f3d1d6cfd 100644 --- a/lib/conncache.c +++ b/lib/conncache.c @@ -6,7 +6,7 @@ * \___|\___/|_| \_\_____| * * Copyright (C) 2012, Linus Nielsen Feltzing, <linus@haxx.se> - * Copyright (C) 2012 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2012 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -73,11 +73,13 @@ void Curl_conncache_destroy(struct conncache *connc) } } -struct connectbundle *Curl_conncache_find_bundle(struct conncache *connc, - char *hostname) +struct connectbundle *Curl_conncache_find_bundle(struct connectdata *conn, + struct conncache *connc) { struct connectbundle *bundle = NULL; + char *hostname = conn->bits.proxy?conn->proxy.name:conn->host.name; + if(connc) bundle = Curl_hash_pick(connc->hash, hostname, strlen(hostname)+1); @@ -127,15 +129,15 @@ CURLcode Curl_conncache_add_conn(struct conncache *connc, struct connectbundle *new_bundle = NULL; struct SessionHandle *data = conn->data; - bundle = Curl_conncache_find_bundle(data->state.conn_cache, - conn->host.name); + bundle = Curl_conncache_find_bundle(conn, data->state.conn_cache); if(!bundle) { + char *hostname = conn->bits.proxy?conn->proxy.name:conn->host.name; + result = Curl_bundle_create(data, &new_bundle); if(result) return result; - if(!conncache_add_bundle(data->state.conn_cache, - conn->host.name, new_bundle)) { + if(!conncache_add_bundle(data->state.conn_cache, hostname, new_bundle)) { Curl_bundle_destroy(new_bundle); return CURLE_OUT_OF_MEMORY; } diff --git a/lib/conncache.h b/lib/conncache.h index d793f2482..e77a084a7 100644 --- a/lib/conncache.h +++ b/lib/conncache.h @@ -7,6 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * + * Copyright (C) 2015, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2012 - 2014, Linus Nielsen Feltzing, <linus@haxx.se> * * This software is licensed as described in the file COPYING, which @@ -33,8 +34,9 @@ struct conncache *Curl_conncache_init(int size); void Curl_conncache_destroy(struct conncache *connc); -struct connectbundle *Curl_conncache_find_bundle(struct conncache *connc, - char *hostname); +/* return the correct bundle, to a host or a proxy */ +struct connectbundle *Curl_conncache_find_bundle(struct connectdata *conn, + struct conncache *connc); CURLcode Curl_conncache_add_conn(struct conncache *connc, struct connectdata *conn); @@ -3070,8 +3070,7 @@ ConnectionExists(struct SessionHandle *data, /* Look up the bundle with all the connections to this particular host */ - bundle = Curl_conncache_find_bundle(data->state.conn_cache, - needle->host.name); + bundle = Curl_conncache_find_bundle(needle, data->state.conn_cache); if(bundle) { size_t max_pipe_len = Curl_multi_max_pipeline_length(data->multi); size_t best_pipe_len = max_pipe_len; @@ -5658,8 +5657,9 @@ static CURLcode create_conn(struct SessionHandle *data, /* set a pointer to the hostname we display */ fix_hostname(data, conn, &conn->host); - infof(data, "Re-using existing connection! (#%ld) with host %s\n", + infof(data, "Re-using existing connection! (#%ld) with %s %s\n", conn->connection_id, + conn->bits.proxy?"proxy":"host", conn->proxy.name?conn->proxy.dispname:conn->host.dispname); } else { @@ -5668,8 +5668,7 @@ static CURLcode create_conn(struct SessionHandle *data, connections we are allowed to open. */ struct connectbundle *bundle; - bundle = Curl_conncache_find_bundle(data->state.conn_cache, - conn->host.name); + bundle = Curl_conncache_find_bundle(conn, data->state.conn_cache); if(max_host_connections > 0 && bundle && (bundle->num_connections >= max_host_connections)) { struct connectdata *conn_candidate; |