diff options
author | Okhin Vasilij <OkhinVI@gmail.com> | 2016-11-21 17:01:25 +0700 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2016-11-23 13:06:20 +0100 |
commit | 5ef09a00dc71ca9034c4b5378da9110b189a375f (patch) | |
tree | c69c166b1ccc1b31397f4e017021513013ea6bf0 /lib/url.c | |
parent | 9e79b224783463d049cb2536e385d55c56962aa5 (diff) | |
download | curl-5ef09a00dc71ca9034c4b5378da9110b189a375f.tar.gz |
HTTPS-proxy: fixed mbedtls and polishing
Diffstat (limited to 'lib/url.c')
-rw-r--r-- | lib/url.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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 */ } |