aboutsummaryrefslogtreecommitdiff
path: root/lib/url.c
diff options
context:
space:
mode:
authorOkhin Vasilij <OkhinVI@gmail.com>2016-11-21 17:01:25 +0700
committerDaniel Stenberg <daniel@haxx.se>2016-11-24 23:41:45 +0100
commitc6da05a5ec0c5250df077e42647c498f8ae38e8d (patch)
tree9e14b903397afb8f2bc8d0385aa51ef90e8cb84f /lib/url.c
parent49765cd75cdd40ceecb125ac893051be90977018 (diff)
HTTPS-proxy: fixed mbedtls and polishing
Diffstat (limited to 'lib/url.c')
-rw-r--r--lib/url.c6
1 files changed, 2 insertions, 4 deletions
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 */
}