curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-20 02:52:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

configure: don't say HTTPS-proxy is enabled when disabled!

Browse Source 
Reported-by: Kamil Dudka
Reviewed-by: Kamil Dudka
Bug: https://github.com/curl/curl/pull/5735#issuecomment-701376388
Closes #6029
This commit is contained in:
Daniel Stenberg 2020-09-30 15:31:01 +02:00
parent 2aac895fb6
commit c8204ed6a2
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -503,6 +503,7 @@ AC_HELP_STRING([--disable-proxy],[Disable proxy support]),
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_DEFINE(CURL_DISABLE_PROXY, 1, [to disable proxies]) AC_DEFINE(CURL_DISABLE_PROXY, 1, [to disable proxies])
AC_SUBST(CURL_DISABLE_PROXY, [1]) AC_SUBST(CURL_DISABLE_PROXY, [1])
https_proxy="no"
;; ;;
*) AC_MSG_RESULT(yes) *) AC_MSG_RESULT(yes)
;; ;;
@ -5029,10 +5030,13 @@ if test "x$CURL_WITH_MULTI_SSL" = "x1"; then
SUPPORT_FEATURES="$SUPPORT_FEATURES MultiSSL" SUPPORT_FEATURES="$SUPPORT_FEATURES MultiSSL"
fi fi
dnl if not explictily turned off, HTTPS-proxy comes with some TLS backends
if test "x$https_proxy" != "xno"; then
if test "x$OPENSSL_ENABLED" = "x1" -o "x$GNUTLS_ENABLED" = "x1" \ if test "x$OPENSSL_ENABLED" = "x1" -o "x$GNUTLS_ENABLED" = "x1" \
-o "x$NSS_ENABLED" = "x1"; then -o "x$NSS_ENABLED" = "x1"; then
SUPPORT_FEATURES="$SUPPORT_FEATURES HTTPS-proxy" SUPPORT_FEATURES="$SUPPORT_FEATURES HTTPS-proxy"
fi fi
fi
if test "x$ECH_ENABLED" = "x1"; then if test "x$ECH_ENABLED" = "x1"; then
SUPPORT_FEATURES="$SUPPORT_FEATURES ECH" SUPPORT_FEATURES="$SUPPORT_FEATURES ECH"

2
lib/version.c
View File

@ -470,11 +470,13 @@ curl_version_info_data *curl_version_info(CURLversion stamp)
#ifdef USE_SSL #ifdef USE_SSL
Curl_ssl_version(ssl_buffer, sizeof(ssl_buffer)); Curl_ssl_version(ssl_buffer, sizeof(ssl_buffer));
version_info.ssl_version = ssl_buffer; version_info.ssl_version = ssl_buffer;
#ifndef CURL_DISABLE_PROXY
if(Curl_ssl->supports & SSLSUPP_HTTPS_PROXY) if(Curl_ssl->supports & SSLSUPP_HTTPS_PROXY)
version_info.features |= CURL_VERSION_HTTPS_PROXY; version_info.features |= CURL_VERSION_HTTPS_PROXY;
else else
version_info.features &= ~CURL_VERSION_HTTPS_PROXY; version_info.features &= ~CURL_VERSION_HTTPS_PROXY;
#endif #endif
#endif
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
version_info.libz_version = zlibVersion(); version_info.libz_version = zlibVersion();