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/version.c | |
parent | 937899a3b8e1124df7a66b83925349d5c9f9e5a9 (diff) | |
download | curl-f0b4db1ab0f803fdad576d77220434d04651db76.tar.gz |
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/version.c')
-rw-r--r-- | lib/version.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/version.c b/lib/version.c index 3d1776813..b1959dee1 100644 --- a/lib/version.c +++ b/lib/version.c @@ -324,9 +324,6 @@ static curl_version_info_data version_info = { #if defined(USE_LIBPSL) | CURL_VERSION_PSL #endif -#if defined(HTTPS_PROXY_SUPPORT) - | CURL_VERSION_HTTPS_PROXY -#endif , NULL, /* ssl_version */ 0, /* ssl_version_num, this is kept at zero */ @@ -355,6 +352,10 @@ curl_version_info_data *curl_version_info(CURLversion stamp) #ifdef USE_SSL Curl_ssl_version(ssl_buffer, sizeof(ssl_buffer)); version_info.ssl_version = ssl_buffer; + if(Curl_ssl->support_https_proxy) + version_info.features |= CURL_VERSION_HTTPS_PROXY; + else + version_info.features &= ~CURL_VERSION_HTTPS_PROXY; #endif #ifdef HAVE_LIBZ |