summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-09-30 15:31:01 +0200
committerDaniel Stenberg <daniel@haxx.se>2020-09-30 22:43:43 +0200
commitc8204ed6a2fa21a746ad019e1a3efbcbd650f8b2 (patch)
treec1bb7ce79b42b2ec2ef4bb7b5136cf82d8512f81 /configure.ac
parent2aac895fb6a7b19dada73f55041b710670befa49 (diff)
downloadcurl-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
Diffstat (limited to 'configure.ac')
-rwxr-xr-xconfigure.ac10
1 files changed, 7 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