From 6a1f89551d297255d17801edfe2cdfb89cd1e1e6 Mon Sep 17 00:00:00 2001 From: Inaha <72016813+tsukinaha@users.noreply.github.com> Date: Thu, 21 Nov 2024 18:15:53 +0800 Subject: [PATCH] Revert "fix: proxy under AutoConfigUrl" (#247) This reverts commit f78ddce2a4ae1f5831bf73ce30affe454b397031. --- build.rs | 4 +--- src/client/proxy.rs | 12 +----------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/build.rs b/build.rs index c53f8eb8..15e9ff3f 100644 --- a/build.rs +++ b/build.rs @@ -46,8 +46,6 @@ fn main() { #[cfg(windows)] { println!("cargo:rerun-if-changed=tsukimi-manifest.rc"); - embed_resource::compile("./tsukimi_manifest.rc", embed_resource::NONE) - .manifest_optional() - .unwrap(); + embed_resource::compile("./tsukimi_manifest.rc", embed_resource::NONE); } } diff --git a/src/client/proxy.rs b/src/client/proxy.rs index b78c5285..89b9733c 100644 --- a/src/client/proxy.rs +++ b/src/client/proxy.rs @@ -44,7 +44,7 @@ impl ReqClient { client_builder.build().expect("failed to initialize client") }; - + tower::ServiceBuilder::new() .concurrency_limit(SETTINGS.threads() as usize) .service(client) @@ -68,16 +68,6 @@ pub fn get_proxy_settings() -> Option { { let proxy = PCWSTR(proxy_config.lpszProxy.0).to_string().unwrap(); return Some(proxy); - } else if WinHttpGetIEProxyConfigForCurrentUser(&mut proxy_config).is_ok() - && !proxy_config.lpszAutoConfigUrl.is_null() - { - let proxy_url = PCWSTR(proxy_config.lpszAutoConfigUrl.0) - .to_string() - .unwrap(); - let proxy = proxy_url.split('/').collect::>()[..3] - .join("/") - .to_string(); - return Some(proxy); } } None