diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2017-06-26 18:05:38 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-08-28 14:56:56 +0200 |
| commit | f0b4db1ab0f803fdad576d77220434d04651db76 (patch) | |
| tree | 0a7aaa97f79e184999d8bd7e8eb28e7fe4b3ad64 /lib/url.c | |
| parent | 937899a3b8e1124df7a66b83925349d5c9f9e5a9 (diff) | |
vtls: move the SUPPORT_HTTPS_PROXY flag into the Curl_ssl struct
That will allow us to choose the SSL backend at runtime.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Diffstat (limited to 'lib/url.c')
| -rw-r--r-- | lib/url.c | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -5082,13 +5082,14 @@ static CURLcode parse_proxy(struct Curl_easy *data, else proxyptr = proxy; /* No xxx:// head: It's a HTTP proxy */ -#ifndef HTTPS_PROXY_SUPPORT - if(proxytype == CURLPROXY_HTTPS) { - failf(data, "Unsupported proxy \'%s\'" - ", libcurl is built without the HTTPS-proxy support.", proxy); - return CURLE_NOT_BUILT_IN; - } +#ifdef USE_SSL + if(!Curl_ssl->support_https_proxy) #endif + if(proxytype == CURLPROXY_HTTPS) { + failf(data, "Unsupported proxy \'%s\', libcurl is built without the " + "HTTPS-proxy support.", proxy); + return CURLE_NOT_BUILT_IN; + } sockstype = proxytype == CURLPROXY_SOCKS5_HOSTNAME || proxytype == CURLPROXY_SOCKS5 || |