From 852d35b6eadb0bc6117a31cc991f589285a3fc0a Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 11 Mar 2015 11:54:22 +0100 Subject: proxy: re-use proxy connections (regression) When checking for a connection to re-use, a proxy-using request must check for and use a proxy connection and not one based on the host name! Added test 1421 to verify Bug: http://curl.haxx.se/bug/view.cgi?id=1492 --- lib/conncache.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'lib/conncache.c') 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, - * Copyright (C) 2012 - 2014, Daniel Stenberg, , et al. + * Copyright (C) 2012 - 2015, Daniel Stenberg, , 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; } -- cgit v1.2.3