From c6da05a5ec0c5250df077e42647c498f8ae38e8d Mon Sep 17 00:00:00 2001
From: Okhin Vasilij <OkhinVI@gmail.com>
Date: Mon, 21 Nov 2016 17:01:25 +0700
Subject: HTTPS-proxy: fixed mbedtls and polishing

---
 lib/url.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib/url.c')

diff --git a/lib/url.c b/lib/url.c
index 15ba92cae..ad5921353 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -3786,10 +3786,6 @@ ConnectionExists(struct Curl_easy *data,
 CURLcode Curl_connected_proxy(struct connectdata *conn, int sockindex)
 {
   CURLcode result = CURLE_OK;
-  /* if(!conn->bits.proxy || sockindex) */
-    /* this magic only works for the primary socket as the secondary is used
-       for FTP only and it has FTP specific magic in ftp.c */
-    /* return CURLE_OK; */
 
   if(conn->bits.socksproxy) {
 #ifndef CURL_DISABLE_PROXY
@@ -3823,6 +3819,8 @@ CURLcode Curl_connected_proxy(struct connectdata *conn, int sockindex)
       result = CURLE_COULDNT_CONNECT;
     } /* switch proxytype */
     conn->bits.socksproxy_connecting = FALSE;
+#else
+  (void)sockindex;
 #endif /* CURL_DISABLE_PROXY */
   }
 
-- 
cgit v1.2.3