From c1c989034de84b880cd1cffe903a8b6032720b17 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Fri, 25 Jan 2019 14:31:27 -0800
Subject: [PATCH] Added Clone impl for Timeout service factory

---
 actix-service/src/apply.rs |  8 ++++----
 actix-utils/CHANGES.md     |  2 ++
 actix-utils/src/timeout.rs | 12 ++++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/actix-service/src/apply.rs b/actix-service/src/apply.rs
index 89d6559f..8a73c19e 100644
--- a/actix-service/src/apply.rs
+++ b/actix-service/src/apply.rs
@@ -78,7 +78,7 @@ where
 impl<T, F, In, Out, Request> ApplyNewService<T, F, In, Out, Request>
 where
     T: NewService<Request>,
-    F: FnMut(In, &mut T::Service) -> Out,
+    F: FnMut(In, &mut T::Service) -> Out + Clone,
     Out: IntoFuture,
     Out::Error: From<T::Error>,
 {
@@ -129,7 +129,7 @@ where
 pub struct ApplyNewServiceFuture<T, F, In, Out, Request>
 where
     T: NewService<Request>,
-    F: FnMut(In, &mut T::Service) -> Out,
+    F: FnMut(In, &mut T::Service) -> Out + Clone,
     Out: IntoFuture,
 {
     fut: T::Future,
@@ -140,7 +140,7 @@ where
 impl<T, F, In, Out, Request> ApplyNewServiceFuture<T, F, In, Out, Request>
 where
     T: NewService<Request>,
-    F: FnMut(In, &mut T::Service) -> Out,
+    F: FnMut(In, &mut T::Service) -> Out + Clone,
     Out: IntoFuture,
 {
     fn new(fut: T::Future, f: F) -> Self {
@@ -155,7 +155,7 @@ where
 impl<T, F, In, Out, Request> Future for ApplyNewServiceFuture<T, F, In, Out, Request>
 where
     T: NewService<Request>,
-    F: FnMut(In, &mut T::Service) -> Out,
+    F: FnMut(In, &mut T::Service) -> Out + Clone,
     Out: IntoFuture,
     Out::Error: From<T::Error>,
 {
diff --git a/actix-utils/CHANGES.md b/actix-utils/CHANGES.md
index 19eef1b7..df941106 100644
--- a/actix-utils/CHANGES.md
+++ b/actix-utils/CHANGES.md
@@ -6,6 +6,8 @@
 
 * Added Clone impl for Either service
 
+* Added Clone impl for Timeout service factory
+
 * Added Service and NewService for Stream dispatcher
 
 
diff --git a/actix-utils/src/timeout.rs b/actix-utils/src/timeout.rs
index 8a18b1ac..d2e638ad 100644
--- a/actix-utils/src/timeout.rs
+++ b/actix-utils/src/timeout.rs
@@ -43,6 +43,18 @@ impl<T> Timeout<T> {
     }
 }
 
+impl<T> Clone for Timeout<T>
+where
+    T: Clone,
+{
+    fn clone(&self) -> Self {
+        Timeout {
+            inner: self.inner.clone(),
+            timeout: self.timeout,
+        }
+    }
+}
+
 impl<T, Request> NewService<Request> for Timeout<T>
 where
     T: NewService<Request> + Clone,