diff --git a/poem/Cargo.toml b/poem/Cargo.toml index 8f5997d5dc..de0f8c66b8 100644 --- a/poem/Cargo.toml +++ b/poem/Cargo.toml @@ -121,7 +121,7 @@ redis = { version = "0.24.0", optional = true, features = [ "tokio-comp", "connection-manager", ] } -libcookie = { package = "cookie", version = "0.17", features = [ +libcookie = { package = "cookie", version = "0.18", features = [ "percent-encode", "private", "signed", diff --git a/poem/src/listener/rustls.rs b/poem/src/listener/rustls.rs index b03471e7e2..2480dca665 100644 --- a/poem/src/listener/rustls.rs +++ b/poem/src/listener/rustls.rs @@ -411,7 +411,7 @@ impl ResolvesServerCert for ResolveServerCert { fn resolve(&self, client_hello: ClientHello) -> Option> { client_hello .server_name() - .and_then(|name| self.certifcate_keys.get(name).map(Arc::clone)) + .and_then(|name| self.certifcate_keys.get(name).cloned()) .or_else(|| self.fallback.clone()) } } diff --git a/poem/src/web/cookie.rs b/poem/src/web/cookie.rs index ce0b328f9c..1222a9e5e1 100644 --- a/poem/src/web/cookie.rs +++ b/poem/src/web/cookie.rs @@ -364,7 +364,7 @@ impl CookieJar { pub fn remove(&self, name: impl AsRef) { self.jar .lock() - .remove(libcookie::Cookie::named(name.as_ref().to_string())); + .remove(libcookie::Cookie::build(name.as_ref().to_string())); } /// Returns a reference to the [`Cookie`] inside this jar with the `name`. @@ -562,7 +562,7 @@ impl<'a> PrivateCookieJar<'a> { pub fn remove(&self, name: impl AsRef) { let mut cookie_jar = self.cookie_jar.jar.lock(); let mut private_cookie_jar = cookie_jar.private_mut(self.key); - private_cookie_jar.remove(libcookie::Cookie::named(name.as_ref().to_string())); + private_cookie_jar.remove(libcookie::Cookie::build(name.as_ref().to_string())); } /// Returns cookie inside this jar with the name and authenticates and @@ -595,7 +595,7 @@ impl<'a> SignedCookieJar<'a> { pub fn remove(&self, name: impl AsRef) { let mut cookie_jar = self.cookie_jar.jar.lock(); let mut signed_cookie_jar = cookie_jar.signed_mut(self.key); - signed_cookie_jar.remove(libcookie::Cookie::named(name.as_ref().to_string())); + signed_cookie_jar.remove(libcookie::Cookie::build(name.as_ref().to_string())); } /// Returns cookie inside this jar with the name and authenticates and