[prev in list] [next in list] [prev in thread] [next in thread] 

List:       curl-commits
Subject:    cvs: curl/lib url.c,1.264,1.265
From:       Daniel Stenberg <bagder () users ! sourceforge ! net>
Date:       2003-03-31 3:42:04
[Download RAW message or body]

Update of /cvsroot/curl/curl/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv28322

Modified Files:
	url.c 
Log Message:
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.


Index: url.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/url.c,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- url.c	25 Mar 2003 14:23:12 -0000	1.264
+++ url.c	31 Mar 2003 03:42:01 -0000	1.265
@@ -1272,6 +1272,11 @@
     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. */



-------------------------------------------------------
This SF.net email is sponsored by:
The Definitive IT and Networking Event. Be There!
NetWorld+Interop Las Vegas 2003 -- Register today!
http://ads.sourceforge.net/cgi-bin/redirect.pl?keyn0001en

[prev in list] [next in list] [prev in thread] [next in thread]