From d0ae67503cdb2aeaadcea27af67285eea1cf3756 Mon Sep 17 00:00:00 2001 From: Caijinglong Date: Fri, 13 Oct 2023 20:06:34 +0800 Subject: [PATCH] fix(bundler): read proxy when downloading resources. (#8012) * fix(bundler): read http_proxy env when downloading resources. Signed-off-by: CaiJingLong * Update .changes/add-proxy-for-nsis-download.md * Update add-proxy-for-nsis-download.md * Update tooling/bundler/src/bundle/windows/util.rs --------- Signed-off-by: CaiJingLong --- .changes/add-proxy-for-nsis-download.md | 5 +++++ tooling/bundler/src/bundle/windows/util.rs | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .changes/add-proxy-for-nsis-download.md diff --git a/.changes/add-proxy-for-nsis-download.md b/.changes/add-proxy-for-nsis-download.md new file mode 100644 index 000000000..db69ef005 --- /dev/null +++ b/.changes/add-proxy-for-nsis-download.md @@ -0,0 +1,5 @@ +--- +"tauri-bundler": 'patch:bug' +--- + +Read `HTTP_PROXY` env var when downloading bundling resources on Windows. diff --git a/tooling/bundler/src/bundle/windows/util.rs b/tooling/bundler/src/bundle/windows/util.rs index c23298e3f..96489636a 100644 --- a/tooling/bundler/src/bundle/windows/util.rs +++ b/tooling/bundler/src/bundle/windows/util.rs @@ -22,7 +22,9 @@ pub const WIX_UPDATER_OUTPUT_FOLDER_NAME: &str = "msi-updater"; pub fn download(url: &str) -> crate::Result> { info!(action = "Downloading"; "{}", url); - let response = ureq::get(url).call().map_err(Box::new)?; + + let agent = ureq::AgentBuilder::new().try_proxy_from_env(true).build(); + let response = agent.get(url).call().map_err(Box::new)?; let mut bytes = Vec::new(); response.into_reader().read_to_end(&mut bytes)?; Ok(bytes)