Merge branch 'master' into socks-connector

Author: JPDye

Cargo.toml

@@ -18,18 +18,21 @@ features = ["full"]
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
-hyper = "1.6.0"
+base64 = { version = "0.22", optional = true }
+bytes = "1.7.1"
+futures-channel = { version = "0.3", optional = true }
 futures-util = { version = "0.3.16", default-features = false }
 http = "1.0"
 http-body = "1.0.0"
-bytes = "1.7.1"
+hyper = "1.6.0"
+ipnet = { version = "2.9", optional = true }
+libc = { version = "0.2", optional = true }
+percent-encoding = { version = "2.3", optional = true }
 pin-project-lite = "0.2.4"
-futures-channel = { version = "0.3", optional = true }
 socket2 = { version = "0.5.9", optional = true, features = ["all"] }
 tracing = { version = "0.1", default-features = false, features = ["std"], optional = true }
 tokio = { version = "1", optional = true, default-features = false  }
 tower-service = { version = "0.3", optional = true }
-libc = { version = "0.2", optional = true }
 
 [dev-dependencies]
 hyper = { version = "1.4.0", features = ["full"] }
@@ -42,6 +45,12 @@ pretty_env_logger = "0.5"
 [target.'cfg(any(target_os = "linux", target_os = "macos"))'.dev-dependencies]
 pnet_datalink = "0.35.0"
 
+[target.'cfg(target_os = "macos")'.dependencies]
+system-configuration = { version = "0.6.1", optional = true }
+
+[target.'cfg(windows)'.dependencies]
+windows-registry = { version = "0.4", optional = true }
+
 [features]
 default = []
 
@@ -61,6 +70,8 @@ full = [
 
 client = ["hyper/client", "dep:tracing", "dep:futures-channel", "dep:tower-service"]
 client-legacy = ["client", "dep:socket2", "tokio/sync", "dep:libc"]
+client-proxy = ["client", "dep:base64", "dep:ipnet", "dep:percent-encoding"]
+client-proxy-system = ["dep:system-configuration", "dep:windows-registry"]
 
 server = ["hyper/server"]
 server-auto = ["server", "http1", "http2"]

src/client/mod.rs

@@ -3,3 +3,6 @@
 /// Legacy implementations of `connect` module and `Client`
 #[cfg(feature = "client-legacy")]
 pub mod legacy;
+
+#[cfg(feature = "client-proxy")]
+pub mod proxy;