summaryrefslogtreecommitdiffstats
path: root/lib/conncache.c
diff options
context:
space:
mode:
authorCurl Upstream <curl-library@cool.haxx.se>2016-12-22 15:41:14 (GMT)
committerBrad King <brad.king@kitware.com>2017-02-07 16:37:30 (GMT)
commit4cc2908fdaaf1ab8afe5c2ae5dbb3401859a9aab (patch)
treeef3a36a4eb9b0c43881db54e61574378e104b936 /lib/conncache.c
parent93cc249f3dd7ecd621cd063e4c08bbdb54d971e8 (diff)
downloadCMake-4cc2908fdaaf1ab8afe5c2ae5dbb3401859a9aab.zip
CMake-4cc2908fdaaf1ab8afe5c2ae5dbb3401859a9aab.tar.gz
CMake-4cc2908fdaaf1ab8afe5c2ae5dbb3401859a9aab.tar.bz2
curl 2016-12-22 (44b9b4d4)
Code extracted from: https://github.com/curl/curl.git at commit 44b9b4d4f56d6f6de92c89636994c03984e9cd01 (curl-7_52_1).
Diffstat (limited to 'lib/conncache.c')
-rw-r--r--lib/conncache.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/conncache.c b/lib/conncache.c
index 01b1b44..d8ef9a5 100644
--- a/lib/conncache.c
+++ b/lib/conncache.c
@@ -132,8 +132,10 @@ static char *hashkey(struct connectdata *conn)
{
const char *hostname;
- if(conn->bits.proxy)
- hostname = conn->proxy.name;
+ if(conn->bits.socksproxy)
+ hostname = conn->socks_proxy.host.name;
+ else if(conn->bits.httpproxy)
+ hostname = conn->http_proxy.host.name;
else if(conn->bits.conn_to_host)
hostname = conn->conn_to_host.name;
else