From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 31 Mar 2003 03:42:01 +0000 (+0000)
Subject: Frankie Fong filed bug report #708708 which identified a problem with
X-Git-Tag: curl-7_10_4~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b3f800c030948525b72422413980d4538126e74;p=curl

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

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. */