summaryrefslogtreecommitdiffstats
path: root/lib/version.c
diff options
context:
space:
mode:
authorCurl Upstream <curl-library@cool.haxx.se>2017-10-04 05:52:15 (GMT)
committerBrad King <brad.king@kitware.com>2017-10-10 15:15:03 (GMT)
commitde7c21d677db1ddaeece03c19e13e448f4031511 (patch)
treef812bbd3771bd01de9f7cd91a557766605f6ed2c /lib/version.c
parent06d6d6c4aee149cd6560b919ef6935ef0867d921 (diff)
downloadCMake-de7c21d677db1ddaeece03c19e13e448f4031511.zip
CMake-de7c21d677db1ddaeece03c19e13e448f4031511.tar.gz
CMake-de7c21d677db1ddaeece03c19e13e448f4031511.tar.bz2
curl 2017-10-04 (3ea76790)
Code extracted from: https://github.com/curl/curl.git at commit 3ea76790571c1f7cf1bed34fabffd3cc20ad3dd3 (curl-7_56_0).
Diffstat (limited to 'lib/version.c')
-rw-r--r--lib/version.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/version.c b/lib/version.c
index 3d17768..ebd6006 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -324,8 +324,8 @@ static curl_version_info_data version_info = {
#if defined(USE_LIBPSL)
| CURL_VERSION_PSL
#endif
-#if defined(HTTPS_PROXY_SUPPORT)
- | CURL_VERSION_HTTPS_PROXY
+#if defined(CURL_WITH_MULTI_SSL)
+ | CURL_VERSION_MULTI_SSL
#endif
,
NULL, /* ssl_version */
@@ -355,6 +355,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