From b69ad3ab6a5d2bf4fa75fe7045f7e3b56f6d94c4 Mon Sep 17 00:00:00 2001 From: rami3l Date: Tue, 30 Apr 2024 09:40:17 +0800 Subject: [PATCH 1/2] feat(download-backend)!: refine selection logic --- src/utils/utils.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/utils/utils.rs b/src/utils/utils.rs index e2ad7c0ba8..b5051fc982 100644 --- a/src/utils/utils.rs +++ b/src/utils/utils.rs @@ -221,8 +221,12 @@ fn download_file_( // Download the file // Keep the curl env var around for a bit - let use_curl_backend = process().var_os("RUSTUP_USE_CURL").is_some(); - let use_rustls = process().var_os("RUSTUP_USE_RUSTLS").is_some(); + let use_curl_backend = process() + .var_os("RUSTUP_USE_CURL") + .map_or(false, |it| it != "0"); + let use_rustls = process() + .var_os("RUSTUP_USE_RUSTLS") + .map_or(false, |it| it != "0"); let (backend, notification) = if use_curl_backend { (Backend::Curl, Notification::UsingCurl) } else { From 802fb141902fb990a6f2750bb806de05499c8239 Mon Sep 17 00:00:00 2001 From: rami3l Date: Tue, 30 Apr 2024 09:43:26 +0800 Subject: [PATCH 2/2] feat(download-backend)!: make `reqwest/rustls` the new default --- src/utils/utils.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/utils.rs b/src/utils/utils.rs index b5051fc982..84588d8775 100644 --- a/src/utils/utils.rs +++ b/src/utils/utils.rs @@ -226,7 +226,7 @@ fn download_file_( .map_or(false, |it| it != "0"); let use_rustls = process() .var_os("RUSTUP_USE_RUSTLS") - .map_or(false, |it| it != "0"); + .map_or(true, |it| it != "0"); let (backend, notification) = if use_curl_backend { (Backend::Curl, Notification::UsingCurl) } else {