diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-09-30 15:31:01 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-09-30 22:43:43 +0200 |
| commit | c8204ed6a2fa21a746ad019e1a3efbcbd650f8b2 (patch) | |
| tree | c1bb7ce79b42b2ec2ef4bb7b5136cf82d8512f81 | |
| parent | 2aac895fb6a7b19dada73f55041b710670befa49 (diff) | |
| download | curl-c8204ed6a2fa21a746ad019e1a3efbcbd650f8b2.tar.gz | |
configure: don't say HTTPS-proxy is enabled when disabled!
Reported-by: Kamil Dudka
Reviewed-by: Kamil Dudka
Bug: https://github.com/curl/curl/pull/5735#issuecomment-701376388
Closes #6029
| -rwxr-xr-x | configure.ac | 10 | ||||
| -rw-r--r-- | lib/version.c | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 504b902cc..2304775b1 100755 --- a/configure.ac +++ b/configure.ac @@ -503,6 +503,7 @@ AC_HELP_STRING([--disable-proxy],[Disable proxy support]), AC_MSG_RESULT(no) AC_DEFINE(CURL_DISABLE_PROXY, 1, [to disable proxies]) AC_SUBST(CURL_DISABLE_PROXY, [1]) + https_proxy="no" ;; *) AC_MSG_RESULT(yes) ;; @@ -5029,9 +5030,12 @@ if test "x$CURL_WITH_MULTI_SSL" = "x1"; then SUPPORT_FEATURES="$SUPPORT_FEATURES MultiSSL" fi -if test "x$OPENSSL_ENABLED" = "x1" -o "x$GNUTLS_ENABLED" = "x1" \ - -o "x$NSS_ENABLED" = "x1"; then - SUPPORT_FEATURES="$SUPPORT_FEATURES HTTPS-proxy" +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" \ + -o "x$NSS_ENABLED" = "x1"; then + SUPPORT_FEATURES="$SUPPORT_FEATURES HTTPS-proxy" + fi fi if test "x$ECH_ENABLED" = "x1"; then diff --git a/lib/version.c b/lib/version.c index 1214efa58..bdeba8835 100644 --- a/lib/version.c +++ b/lib/version.c @@ -470,11 +470,13 @@ 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; +#ifndef CURL_DISABLE_PROXY if(Curl_ssl->supports & SSLSUPP_HTTPS_PROXY) version_info.features |= CURL_VERSION_HTTPS_PROXY; else version_info.features &= ~CURL_VERSION_HTTPS_PROXY; #endif +#endif #ifdef HAVE_LIBZ version_info.libz_version = zlibVersion(); |