diff options
| author | Nils Gillmann <gillmann@gnunet.org> | 2018-05-23 10:24:02 +0000 |
|---|---|---|
| committer | Nils Gillmann <gillmann@gnunet.org> | 2018-05-23 10:24:02 +0000 |
| commit | 97f0e8cf8585325401b9d19e433131722f978984 (patch) | |
| tree | 935fa45929a646222b5abdd260a7bfd4be2cd836 /lib/version.c | |
| parent | 422f18ebe7ad2cbcd5d45ed05ae02e959e4a7d8b (diff) | |
| parent | cb013830383f1ccc9757aba36bc32df5ec281c02 (diff) | |
| download | gnurl-97f0e8cf8585325401b9d19e433131722f978984.tar.gz gnurl-97f0e8cf8585325401b9d19e433131722f978984.tar.bz2 gnurl-97f0e8cf8585325401b9d19e433131722f978984.zip | |
Merge tag 'curl-7_60_0' (with fixes)
curl 7.60.0
Signed-off-by: Nils Gillmann <gillmann@gnunet.org>
Diffstat (limited to 'lib/version.c')
| -rw-r--r-- | lib/version.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/version.c b/lib/version.c index 3fb163ee5..69b0bbaaa 100644 --- a/lib/version.c +++ b/lib/version.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -399,7 +399,7 @@ 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) + if(Curl_ssl->supports & SSLSUPP_HTTPS_PROXY) version_info.features |= CURL_VERSION_HTTPS_PROXY; else version_info.features &= ~CURL_VERSION_HTTPS_PROXY; |