aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2003-03-31 03:42:01 +0000
committerDaniel Stenberg <daniel@haxx.se>2003-03-31 03:42:01 +0000
commit4b3f800c030948525b72422413980d4538126e74 (patch)
tree7b83adbce783e94c34d351fb961043d5a9456caa
parent82bc76b2439ce22c3e8e0bdb79b3f15ae0e04b35 (diff)
Frankie Fong filed bug report #708708 which identified a problem with
ConnectionExists() when first doing a proxy connecto to a HTTPS site and then switching over to a HTTP connection to the same host. This fix corrects the problem.
-rw-r--r--lib/url.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/url.c b/lib/url.c
index 2d8d9491c..8a61d05ae 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -1272,6 +1272,11 @@ ConnectionExists(struct SessionHandle *data,
if(!check)
/* NULL pointer means not filled-in entry */
continue;
+
+ if((needle->protocol&PROT_SSL) != (check->protocol&PROT_SSL))
+ /* don't do mixed SSL and non-SSL connections */
+ continue;
+
if(!needle->bits.httpproxy || needle->protocol&PROT_SSL) {
/* The requested connection does not use a HTTP proxy or it
uses SSL. */