From 182b3e5da6ab31b0368ffd51f72264f7f4e31b11 Mon Sep 17 00:00:00 2001 From: Emi Tatsuo Date: Thu, 10 Dec 2020 12:46:27 -0500 Subject: [PATCH] Increase dependency specificity for async-tls This fixes a build error where async-tls v0.10.0 builds fine, but async-tls v0.10.1 (which includes and update from rustls v0.18 to rustls v0.19, fails. This is a build error that I believe additionally affects the current crates.io release. --- Cargo.toml | 2 +- src/server/mod.rs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a494d5c..dff8664 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ repository = "https://tulpa.dev/cadey/maj" [dependencies] async-std = { version = "1.6", optional = true } -async-tls = { default-features = false, optional = true, version = "0" } +async-tls = { default-features = false, optional = true, version = "=0.10.0" } async-trait = { version = "0", optional = true } log = "0.4" mime_guess = "2.0" diff --git a/src/server/mod.rs b/src/server/mod.rs index 5562919..1dc01e7 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -51,10 +51,9 @@ pub async fn serve( ) -> Result where { - let cfg = Arc::new(cfg); let listener = TcpListener::bind(&format!("{}:{}", host, port)).await?; let mut incoming = listener.incoming(); - let acceptor = Arc::new(TlsAcceptor::from(cfg.clone())); + let acceptor = Arc::new(TlsAcceptor::from(cfg)); while let Some(Ok(stream)) = incoming.next().await { let h = h.clone(); let acceptor = acceptor.clone();