aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-05-02 23:15:05 +0200
committerDaniel Stenberg <daniel@haxx.se>2016-05-03 08:18:15 +0200
commit5823179523e9ad02a98ab6e184ed120ad2324481 (patch)
tree10cbf4d06ab938a4681871efb9d0eb05573252b6
parent96eb9a862b4d90694f7ba13af1a6acfb98eb87c7 (diff)
connections: non-HTTP proxies on different ports aren't reused either
Reported-by: Oleg Pudeyev and fuchaoqun Fixes #648
-rw-r--r--lib/conncache.c2
-rw-r--r--lib/url.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/conncache.c b/lib/conncache.c
index 930b932b7..d0c09c826 100644
--- a/lib/conncache.c
+++ b/lib/conncache.c
@@ -140,7 +140,7 @@ static char *hashkey(struct connectdata *conn)
else
hostname = conn->host.name;
- return aprintf("%s:%d", hostname, conn->localport);
+ return aprintf("%s:%d", hostname, conn->port);
}
/* Look up the bundle with all the connections to the same host this
diff --git a/lib/url.c b/lib/url.c
index b1453e697..70ccd0f82 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -3376,7 +3376,7 @@ ConnectionExists(struct SessionHandle *data,
}
}
- if(!needle->bits.httpproxy || (needle->handler->flags&PROTOPT_SSL) ||
+ if(!needle->bits.proxy || (needle->handler->flags&PROTOPT_SSL) ||
(needle->bits.httpproxy && check->bits.httpproxy &&
needle->bits.tunnel_proxy && check->bits.tunnel_proxy &&
Curl_raw_equal(needle->proxy.name, check->proxy.name) &&