mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-11-27 05:50:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

configure: make --disable-hsts work

Browse Source 
The AC_ARG_ENABLE() macro itself uses a variable called
'enable_[option]', so when our script also used a variable with that
name for the purpose of storing what the user wants, it also
accidentally made it impossible to switch off the feature with
--disable-hsts. Fix this by renaming our variable.

Reported-by: Michał Antoniak
Fixes #7669
Closes #7672
This commit is contained in:
Daniel Stenberg 2021-09-04 23:41:07 +02:00
parent c1f7a7b525
commit 9829b94361
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -172,7 +172,7 @@ curl_verbose_msg="enabled (--disable-verbose)"
curl_h3_msg="no (--with-ngtcp2, --with-quiche)"
enable_altsvc="yes"
enable_hsts="yes"
hsts="yes"
dnl
dnl Save some initial values the user might have provided
@ -534,7 +534,7 @@ AS_HELP_STRING([--disable-http],[Disable HTTP support]),
curl_altsvc_msg="no";
curl_hsts_msg="no (--enable-hsts)";
enable_altsvc="no"
enable_hsts="no"
hsts="no"
;;
*) AC_MSG_RESULT(yes)
;;
@ -3901,19 +3901,19 @@ if test -n "$SSL_ENABLED"; then
[ case "$enableval" in
no)
AC_MSG_RESULT(no)
enable_hsts="no"
hsts="no"
;;
*) AC_MSG_RESULT(yes)
;;
esac ],
AC_MSG_RESULT(no)
AC_MSG_RESULT($hsts)
)
else
AC_MSG_NOTICE([disables HSTS due to lack of SSL])
enable_hsts="no"
hsts="no"
fi
if test "x$enable_hsts" != "xyes"; then
if test "x$hsts" != "xyes"; then
curl_hsts_msg="no (--enable-hsts)";
AC_DEFINE(CURL_DISABLE_HSTS, 1, [disable alt-svc])
fi
@ -4038,7 +4038,7 @@ fi
if test "x$enable_altsvc" = "xyes"; then
SUPPORT_FEATURES="$SUPPORT_FEATURES alt-svc"
fi
if test "x$enable_hsts" = "xyes"; then
if test "x$hsts" = "xyes"; then
SUPPORT_FEATURES="$SUPPORT_FEATURES HSTS"
fi