moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

connections: non-HTTP proxies on different ports aren't reused either 

Reported-by: Oleg Pudeyev and fuchaoqun

Fixes #648
This commit is contained in:
Daniel Stenberg 2016-05-02 23:15:05 +02:00
parent 96eb9a862b
commit 5823179523
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/conncache.c
View File

@ -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

2
lib/url.c
View File

@ -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) &&