From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 13 Nov 2001 08:34:24 +0000 (+0000)
Subject: my proxytunnel fix accidentally ruined the normal https connects
X-Git-Tag: curl-7_9_2~101
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c2479ccb7a73db4b8c3071ed4cc92e27d30dabf2;p=thirdparty%2Fcurl.git

my proxytunnel fix accidentally ruined the normal https connects
---

diff --git a/lib/http.c b/lib/http.c
index 6d1330c25d..bb0c26e72e 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -407,13 +407,13 @@ CURLcode Curl_http_connect(struct connectdata *conn)
                                          conn->hostname, conn->remote_port);
     if(CURLE_OK != result)
       return result;
-    
-    if(conn->protocol & PROT_HTTPS) {
-      /* now, perform the SSL initialization for this socket */
-      result = Curl_SSLConnect(conn);
-      if(result)
-        return result;
-    }
+  }    
+
+  if(conn->protocol & PROT_HTTPS) {
+    /* now, perform the SSL initialization for this socket */
+    result = Curl_SSLConnect(conn);
+    if(result)
+      return result;
   }
 
   if(conn->bits.user_passwd && !data->state.this_is_a_follow) {