Merge branch 'master' into dependabot/cargo/redis-0.25

actix · Jun 9, 2024 · 2ea4689 · 2ea4689
2 parents 1ca282a + 433c926
commit 2ea4689
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/actix-cors/src/builder.rs b/actix-cors/src/builder.rs
@@ -214,7 +214,7 @@ impl Cors {
     /// See [`Cors::allowed_methods`] for more info on allowed methods.
     pub fn allow_any_method(mut self) -> Cors {
         if let Some(cors) = cors(&mut self.inner, &self.error) {
-            cors.allowed_methods = ALL_METHODS_SET.clone();
+            ALL_METHODS_SET.clone_into(&mut cors.allowed_methods);
         }
 
         self

diff --git a/actix-limitation/src/lib.rs b/actix-limitation/src/lib.rs
@@ -138,7 +138,7 @@ impl Limiter {
         let key = key.into();
         let expires = self.period.as_secs();
 
-        let mut connection = self.client.get_tokio_connection().await?;
+        let mut connection = self.client.get_multiplexed_tokio_connection().await?;
 
         // The seed of this approach is outlined Atul R in a blog post about rate limiting using
         // NodeJS and Redis. For more details, see https://blog.atulr.com/rate-limiter