Revert back to reqwest, using rustls feature (bp #6041) (#6064)

automerge
This commit is contained in:
mergify[bot]
2019-09-24 15:35:07 -07:00
committed by Grimes
parent 2cc0ab2c5f
commit 04aaa714e6
19 changed files with 348 additions and 169 deletions

View File

@@ -22,6 +22,7 @@ indicatif = "0.12.0"
lazy_static = "1.4.0"
log = "0.4.8"
nix = "0.15.0"
reqwest = { version = "0.9.20", default-features = false, features = ["rustls-tls"] }
semver = "0.9.0"
serde = "1.0.101"
serde_derive = "1.0.101"
@@ -34,7 +35,6 @@ solana-sdk = { path = "../sdk", version = "0.19.0-pre0" }
tar = "0.4.26"
tempdir = "0.3.7"
url = "2.1.0"
ureq = "0.11.1"
[target."cfg(windows)".dependencies]
winapi = "0.3.8"

View File

@@ -74,15 +74,17 @@ fn download_to_temp_archive(
let temp_dir = TempDir::new(clap::crate_name!())?;
let temp_file = temp_dir.path().join("release.tar.bz2");
let client = ureq::agent();
let client = reqwest::Client::new();
let progress_bar = new_spinner_progress_bar();
progress_bar.set_message(&format!("{}Downloading...", TRUCK));
let response = client.get(url.as_str()).call();
let response = client.get(url.as_str()).send()?;
let download_size = {
response
.header("Content-Length")
.headers()
.get(reqwest::header::CONTENT_LENGTH)
.and_then(|content_length| content_length.to_str().ok())
.and_then(|content_length| content_length.parse().ok())
.unwrap_or(0)
};
@@ -115,7 +117,7 @@ fn download_to_temp_archive(
let mut source = DownloadProgress {
progress_bar,
response: response.into_reader(),
response,
};
let mut file = File::create(&temp_file)?;