TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-04-15 04:41:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: http proxy (#11570)

Browse Source 
Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou
2025-04-26 13:04:41 +08:00
committed by GitHub
parent c0789a5fc0
commit f438bf582b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/hbbs_http/http_client.rs
View File

@@ -6,15 +6,17 @@ use reqwest::Client as AsyncClient;
macro_rules! configure_http_client { macro_rules! configure_http_client {
($builder:expr, $Client: ty) => {{ ($builder:expr, $Client: ty) => {{
let mut builder = $builder; // https://github.com/rustdesk/rustdesk/issues/11569
// https://docs.rs/reqwest/latest/reqwest/struct.ClientBuilder.html#method.no_proxy
let mut builder = $builder.no_proxy();
let client = if let Some(conf) = Config::get_socks() { let client = if let Some(conf) = Config::get_socks() {
let proxy_result = Proxy::from_conf(&conf, None); let proxy_result = Proxy::from_conf(&conf, None);
match proxy_result { match proxy_result {
Ok(proxy) => { Ok(proxy) => {
let proxy_setup = match &proxy.intercept { let proxy_setup = match &proxy.intercept {
ProxyScheme::Http { host, .. } =>{ reqwest::Proxy::http(format!("http://{}", host))}, ProxyScheme::Http { host, .. } =>{ reqwest::Proxy::all(format!("http://{}", host))},
ProxyScheme::Https { host, .. } => {reqwest::Proxy::https(format!("https://{}", host))}, ProxyScheme::Https { host, .. } => {reqwest::Proxy::all(format!("https://{}", host))},
ProxyScheme::Socks5 { addr, .. } => { reqwest::Proxy::all(&format!("socks5://{}", addr)) } ProxyScheme::Socks5 { addr, .. } => { reqwest::Proxy::all(&format!("socks5://{}", addr)) }
}; };