proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-08-08 05:35:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

http: move TLS helper to client feature

Browse Source 
it's only used there and pulls in hyper and tokio, which we don't
want/need in http-helpers.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2022-06-27 09:42:27 +02:00
parent 210d4fdb68
commit 94456ee4b1
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
proxmox-http/Cargo.toml
View File

@ -16,7 +16,7 @@ anyhow = "1.0"
base64 = { version = "0.13", optional = true } base64 = { version = "0.13", optional = true }
futures = { version = "0.3", optional = true } futures = { version = "0.3", optional = true }
http = { version = "0.2", optional = true } http = { version = "0.2", optional = true }
hyper = { version = "0.14", features = [ "full" ], optional = true } hyper = { version = "0.14", default_features = false, optional = true }
openssl = { version = "0.10", optional = true } openssl = { version = "0.10", optional = true }
serde_json = { version = "1.0", optional = true } serde_json = { version = "1.0", optional = true }
tokio = { version = "1.0", features = [], optional = true } tokio = { version = "1.0", features = [], optional = true }
@ -30,8 +30,8 @@ proxmox-lang = { path = "../proxmox-lang", optional = true, version = "1.1" }
[features] [features]
default = [] default = []
client = [ "futures", "http-helpers", "openssl" ] client = [ "futures", "http-helpers", "hyper/full", "openssl", "tokio/io-util", "tokio-openssl" ]
http-helpers = [ "base64", "http", "hyper", "serde_json", "tokio/io-util", "tokio-openssl", "proxmox-sys", "url" ] http-helpers = [ "base64", "http", "proxmox-sys", "serde_json", "url" ]
websocket = [ websocket = [
"base64", "base64",
"futures", "futures",

2
proxmox-http/src/client/connector.rs
View File

@ -15,9 +15,9 @@ use tokio_openssl::SslStream;
use proxmox_sys::linux::socket::set_tcp_keepalive; use proxmox_sys::linux::socket::set_tcp_keepalive;
use crate::proxy_config::ProxyConfig; use crate::proxy_config::ProxyConfig;
use crate::tls::MaybeTlsStream;
use crate::uri::build_authority; use crate::uri::build_authority;
use super::tls::MaybeTlsStream;
use super::{RateLimitedStream, ShareableRateLimit}; use super::{RateLimitedStream, ShareableRateLimit};
type SharedRateLimit = Arc<dyn ShareableRateLimit>; type SharedRateLimit = Arc<dyn ShareableRateLimit>;

2
proxmox-http/src/client/mod.rs
View File

@ -14,3 +14,5 @@ pub use connector::HttpsConnector;
mod simple; mod simple;
pub use simple::SimpleHttp; pub use simple::SimpleHttp;
pub use simple::SimpleHttpOptions; pub use simple::SimpleHttpOptions;
pub mod tls;

0
proxmox-http/src/tls.rs → proxmox-http/src/client/tls.rs
View File

3
proxmox-http/src/lib.rs
View File

@ -3,9 +3,6 @@
#[cfg(feature = "websocket")] #[cfg(feature = "websocket")]
pub mod websocket; pub mod websocket;
#[cfg(feature = "http-helpers")]
pub mod tls;
#[cfg(feature = "http-helpers")] #[cfg(feature = "http-helpers")]
pub mod uri; pub mod uri;