mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-11-25 19:11:10 +00:00
Code Issues Projects Releases Wiki Activity

fix: correct aws rustls v0.23 feature gating

Browse source
This commit is contained in:
Rob Ede 2024-05-19 11:55:12 +01:00
parent 9a437fe835
commit acb740584c
No known key found for this signature in database
GPG key ID: 97C636207D3EF933
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actix-http/Cargo.toml
View file

@ -115,7 +115,7 @@ rand = { version = "0.8", optional = true }
sha1 = { version = "0.10", optional = true } sha1 = { version = "0.10", optional = true }
# openssl/rustls # openssl/rustls
actix-tls = { version = "3.3", default-features = false, optional = true } actix-tls = { version = "3.4", default-features = false, optional = true }
# compress-* # compress-*
brotli = { version = "6", optional = true } brotli = { version = "6", optional = true }

2
actix-web/Cargo.toml
View file

@ -92,7 +92,7 @@ actix-rt = { version = "2.6", default-features = false }
actix-server = "2" actix-server = "2"
actix-service = "2" actix-service = "2"
actix-utils = "3" actix-utils = "3"
actix-tls = { version = "3.3", default-features = false, optional = true } actix-tls = { version = "3.4", default-features = false, optional = true }
actix-http = { version = "3.7", features = ["ws"] } actix-http = { version = "3.7", features = ["ws"] }
actix-router = { version = "0.5", default-features = false, features = ["http"] } actix-router = { version = "0.5", default-features = false, features = ["http"] }

4
awc/Cargo.toml
View file

@ -83,7 +83,7 @@ actix-codec = "0.5"
actix-service = "2" actix-service = "2"
actix-http = { version = "3.7", features = ["http2", "ws"] } actix-http = { version = "3.7", features = ["http2", "ws"] }
actix-rt = { version = "2.1", default-features = false } actix-rt = { version = "2.1", default-features = false }
actix-tls = { version = "3.3", features = ["connect", "uri"] } actix-tls = { version = "3.4", features = ["connect", "uri"] }
actix-utils = "3" actix-utils = "3"
base64 = "0.22" base64 = "0.22"
@ -120,7 +120,7 @@ actix-http = { version = "3.7", features = ["openssl"] }
actix-http-test = { version = "3", features = ["openssl"] } actix-http-test = { version = "3", features = ["openssl"] }
actix-server = "2" actix-server = "2"
actix-test = { version = "0.1", features = ["openssl", "rustls-0_23"] } actix-test = { version = "0.1", features = ["openssl", "rustls-0_23"] }
actix-tls = { version = "3.3", features = ["openssl", "rustls-0_23"] } actix-tls = { version = "3.4", features = ["openssl", "rustls-0_23"] }
actix-utils = "3" actix-utils = "3"
actix-web = { version = "4", features = ["openssl"] } actix-web = { version = "4", features = ["openssl"] }

5
awc/src/client/connector.rs
View file

@ -131,7 +131,6 @@ impl Connector<()> {
OurTlsConnector::Rustls023(std::sync::Arc::new(config)) OurTlsConnector::Rustls023(std::sync::Arc::new(config))
} }
} else if #[cfg(any(feature = "rustls-0_22-webpki-roots", feature = "rustls-0_22-native-roots"))] { } else if #[cfg(any(feature = "rustls-0_22-webpki-roots", feature = "rustls-0_22-native-roots"))] {
/// Build TLS connector with Rustls v0.22, based on supplied ALPN protocols. /// Build TLS connector with Rustls v0.22, based on supplied ALPN protocols.
fn build_tls(protocols: Vec<Vec<u8>>) -> OurTlsConnector { fn build_tls(protocols: Vec<Vec<u8>>) -> OurTlsConnector {
@ -743,6 +742,9 @@ where
feature = "rustls-0_21", feature = "rustls-0_21",
feature = "rustls-0_22-webpki-roots", feature = "rustls-0_22-webpki-roots",
feature = "rustls-0_22-native-roots", feature = "rustls-0_22-native-roots",
feature = "rustls-0_23",
feature = "rustls-0_23-webpki-roots",
feature = "rustls-0_23-native-roots"
))] ))]
struct TlsConnectorService<Tcp, Tls> { struct TlsConnectorService<Tcp, Tls> {
/// TCP connection is canceled on `TcpConnectorInnerService`'s timeout setting. /// TCP connection is canceled on `TcpConnectorInnerService`'s timeout setting.
@ -761,6 +763,7 @@ struct TlsConnectorService<Tcp, Tls> {
feature = "rustls-0_21", feature = "rustls-0_21",
feature = "rustls-0_22-webpki-roots", feature = "rustls-0_22-webpki-roots",
feature = "rustls-0_22-native-roots", feature = "rustls-0_22-native-roots",
feature = "rustls-0_23",
))] ))]
impl<Tcp, Tls, IO> Service<Connect> for TlsConnectorService<Tcp, Tls> impl<Tcp, Tls, IO> Service<Connect> for TlsConnectorService<Tcp, Tls>
where where