aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/util
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe/src/util')
-rw-r--r--crates/shirabe/src/util/http/proxy_manager.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/crates/shirabe/src/util/http/proxy_manager.rs b/crates/shirabe/src/util/http/proxy_manager.rs
index 13f0b521..3101f6e0 100644
--- a/crates/shirabe/src/util/http/proxy_manager.rs
+++ b/crates/shirabe/src/util/http/proxy_manager.rs
@@ -4,6 +4,7 @@ use crate::downloader::TransportException;
use crate::util::NoProxyPattern;
use crate::util::http::ProxyItem;
use crate::util::http::RequestProxy;
+use shirabe_php_shim::PHP_SERVER;
use std::sync::Mutex;
use std::sync::atomic::{AtomicU64, Ordering};
@@ -133,10 +134,10 @@ impl ProxyManager {
fn get_proxy_env(env_name: &str) -> (Option<String>, String) {
for name in [env_name.to_lowercase(), env_name.to_uppercase()] {
- if let Ok(val) = std::env::var(&name)
+ if let Some(val) = PHP_SERVER.lock().unwrap().get(&name)
&& !val.is_empty()
{
- return (Some(val), name);
+ return (Some(val.to_string_lossy().into_owned()), name);
}
}
(None, String::new())