From 1af149b9e61090556b3df98e21e11930dc9c337d Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Sat, 9 Feb 2019 20:27:39 -0800
Subject: [PATCH] remove Clone constraint from handler service

---
 src/h1/dispatcher.rs | 15 ++++++++-------
 src/h1/service.rs    | 22 +++++++++++-----------
 src/h2/dispatcher.rs |  7 ++++---
 src/h2/service.rs    | 35 ++++++++++++++++++++---------------
 src/request.rs       |  9 ---------
 5 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/src/h1/dispatcher.rs b/src/h1/dispatcher.rs
index 667e674c5..06d4312a4 100644
--- a/src/h1/dispatcher.rs
+++ b/src/h1/dispatcher.rs
@@ -5,6 +5,7 @@ use std::time::Instant;
 
 use actix_codec::{AsyncRead, AsyncWrite, Framed};
 use actix_service::Service;
+use actix_utils::cloneable::CloneableService;
 use bitflags::bitflags;
 use futures::{try_ready, Async, Future, Poll, Sink, Stream};
 use log::{debug, error, trace};
@@ -35,18 +36,18 @@ bitflags! {
 }
 
 /// Dispatcher for HTTP/1.1 protocol
-pub struct Dispatcher<T, S: Service, B: MessageBody>
+pub struct Dispatcher<T, S: Service + 'static, B: MessageBody>
 where
     S::Error: Debug,
 {
     inner: Option<InnerDispatcher<T, S, B>>,
 }
 
-struct InnerDispatcher<T, S: Service, B: MessageBody>
+struct InnerDispatcher<T, S: Service + 'static, B: MessageBody>
 where
     S::Error: Debug,
 {
-    service: S,
+    service: CloneableService<S>,
     flags: Flags,
     framed: Framed<T, Codec>,
     error: Option<DispatchError<S::Error>>,
@@ -85,13 +86,13 @@ impl<S: Service, B: MessageBody> State<S, B> {
 impl<T, S, B> Dispatcher<T, S, B>
 where
     T: AsyncRead + AsyncWrite,
-    S: Service<Request = Request>,
+    S: Service<Request = Request> + 'static,
     S::Error: Debug,
     S::Response: Into<Response<B>>,
     B: MessageBody,
 {
     /// Create http/1 dispatcher.
-    pub fn new(stream: T, config: ServiceConfig, service: S) -> Self {
+    pub fn new(stream: T, config: ServiceConfig, service: CloneableService<S>) -> Self {
         Dispatcher::with_timeout(stream, config, None, service)
     }
 
@@ -100,7 +101,7 @@ where
         stream: T,
         config: ServiceConfig,
         timeout: Option<Delay>,
-        service: S,
+        service: CloneableService<S>,
     ) -> Self {
         let keepalive = config.keep_alive_enabled();
         let flags = if keepalive {
@@ -140,7 +141,7 @@ where
 impl<T, S, B> InnerDispatcher<T, S, B>
 where
     T: AsyncRead + AsyncWrite,
-    S: Service<Request = Request>,
+    S: Service<Request = Request> + 'static,
     S::Error: Debug,
     S::Response: Into<Response<B>>,
     B: MessageBody,
diff --git a/src/h1/service.rs b/src/h1/service.rs
index 02a4b15d6..169a80ebc 100644
--- a/src/h1/service.rs
+++ b/src/h1/service.rs
@@ -4,6 +4,7 @@ use std::net;
 
 use actix_codec::{AsyncRead, AsyncWrite, Framed};
 use actix_service::{IntoNewService, NewService, Service};
+use actix_utils::cloneable::CloneableService;
 use futures::future::{ok, FutureResult};
 use futures::{try_ready, Async, Future, Poll, Stream};
 use log::error;
@@ -28,10 +29,10 @@ pub struct H1Service<T, S, B> {
 
 impl<T, S, B> H1Service<T, S, B>
 where
-    S: NewService<Request = Request<Payload>> + Clone,
-    S::Service: Clone,
+    S: NewService<Request = Request<Payload>>,
     S::Error: Debug,
     S::Response: Into<Response<B>>,
+    S::Service: 'static,
     B: MessageBody,
 {
     /// Create new `HttpService` instance.
@@ -54,10 +55,10 @@ where
 impl<T, S, B> NewService for H1Service<T, S, B>
 where
     T: AsyncRead + AsyncWrite,
-    S: NewService<Request = Request> + Clone,
-    S::Service: Clone,
+    S: NewService<Request = Request>,
     S::Error: Debug,
     S::Response: Into<Response<B>>,
+    S::Service: 'static,
     B: MessageBody,
 {
     type Request = T;
@@ -93,7 +94,6 @@ pub struct H1ServiceBuilder<T, S> {
 impl<T, S> H1ServiceBuilder<T, S>
 where
     S: NewService<Request = Request>,
-    S::Service: Clone,
     S::Error: Debug,
 {
     /// Create instance of `ServiceConfigBuilder`
@@ -217,7 +217,7 @@ impl<T, S, B> Future for H1ServiceResponse<T, S, B>
 where
     T: AsyncRead + AsyncWrite,
     S: NewService<Request = Request>,
-    S::Service: Clone,
+    S::Service: 'static,
     S::Error: Debug,
     S::Response: Into<Response<B>>,
     B: MessageBody,
@@ -235,22 +235,22 @@ where
 }
 
 /// `Service` implementation for HTTP1 transport
-pub struct H1ServiceHandler<T, S, B> {
-    srv: S,
+pub struct H1ServiceHandler<T, S: 'static, B> {
+    srv: CloneableService<S>,
     cfg: ServiceConfig,
     _t: PhantomData<(T, B)>,
 }
 
 impl<T, S, B> H1ServiceHandler<T, S, B>
 where
-    S: Service<Request = Request> + Clone,
+    S: Service<Request = Request>,
     S::Error: Debug,
     S::Response: Into<Response<B>>,
     B: MessageBody,
 {
     fn new(cfg: ServiceConfig, srv: S) -> H1ServiceHandler<T, S, B> {
         H1ServiceHandler {
-            srv,
+            srv: CloneableService::new(srv),
             cfg,
             _t: PhantomData,
         }
@@ -260,7 +260,7 @@ where
 impl<T, S, B> Service for H1ServiceHandler<T, S, B>
 where
     T: AsyncRead + AsyncWrite,
-    S: Service<Request = Request> + Clone,
+    S: Service<Request = Request>,
     S::Error: Debug,
     S::Response: Into<Response<B>>,
     B: MessageBody,
diff --git a/src/h2/dispatcher.rs b/src/h2/dispatcher.rs
index b7339fa1d..5a8c4b855 100644
--- a/src/h2/dispatcher.rs
+++ b/src/h2/dispatcher.rs
@@ -5,6 +5,7 @@ use std::{fmt, mem};
 
 use actix_codec::{AsyncRead, AsyncWrite};
 use actix_service::Service;
+use actix_utils::cloneable::CloneableService;
 use bitflags::bitflags;
 use bytes::{Bytes, BytesMut};
 use futures::{try_ready, Async, Future, Poll, Sink, Stream};
@@ -37,9 +38,9 @@ bitflags! {
 }
 
 /// Dispatcher for HTTP/2 protocol
-pub struct Dispatcher<T: AsyncRead + AsyncWrite, S: Service, B: MessageBody> {
+pub struct Dispatcher<T: AsyncRead + AsyncWrite, S: Service + 'static, B: MessageBody> {
     flags: Flags,
-    service: S,
+    service: CloneableService<S>,
     connection: Connection<T, Bytes>,
     config: ServiceConfig,
     ka_expire: Instant,
@@ -56,7 +57,7 @@ where
     B: MessageBody + 'static,
 {
     pub fn new(
-        service: S,
+        service: CloneableService<S>,
         connection: Connection<T, Bytes>,
         config: ServiceConfig,
         timeout: Option<Delay>,
diff --git a/src/h2/service.rs b/src/h2/service.rs
index a1526375f..16b7e4956 100644
--- a/src/h2/service.rs
+++ b/src/h2/service.rs
@@ -4,6 +4,7 @@ use std::{io, net};
 
 use actix_codec::{AsyncRead, AsyncWrite, Framed};
 use actix_service::{IntoNewService, NewService, Service};
+use actix_utils::cloneable::CloneableService;
 use bytes::Bytes;
 use futures::future::{ok, FutureResult};
 use futures::{try_ready, Async, Future, Poll, Stream};
@@ -30,8 +31,8 @@ pub struct H2Service<T, S, B> {
 
 impl<T, S, B> H2Service<T, S, B>
 where
-    S: NewService<Request = Request<Payload>> + Clone,
-    S::Service: Clone + 'static,
+    S: NewService<Request = Request<Payload>>,
+    S::Service: 'static,
     S::Error: Into<Error> + Debug + 'static,
     S::Response: Into<Response<B>>,
     B: MessageBody + 'static,
@@ -56,8 +57,8 @@ where
 impl<T, S, B> NewService for H2Service<T, S, B>
 where
     T: AsyncRead + AsyncWrite,
-    S: NewService<Request = Request<Payload>> + Clone,
-    S::Service: Clone + 'static,
+    S: NewService<Request = Request<Payload>>,
+    S::Service: 'static,
     S::Error: Into<Error> + Debug,
     S::Response: Into<Response<B>>,
     B: MessageBody + 'static,
@@ -95,7 +96,7 @@ pub struct H2ServiceBuilder<T, S> {
 impl<T, S> H2ServiceBuilder<T, S>
 where
     S: NewService<Request = Request<Payload>>,
-    S::Service: Clone + 'static,
+    S::Service: 'static,
     S::Error: Into<Error> + Debug + 'static,
 {
     /// Create instance of `H2ServiceBuilder`
@@ -238,7 +239,7 @@ impl<T, S, B> Future for H2ServiceResponse<T, S, B>
 where
     T: AsyncRead + AsyncWrite,
     S: NewService<Request = Request<Payload>>,
-    S::Service: Clone + 'static,
+    S::Service: 'static,
     S::Response: Into<Response<B>>,
     S::Error: Into<Error> + Debug,
     B: MessageBody + 'static,
@@ -256,23 +257,23 @@ where
 }
 
 /// `Service` implementation for http/2 transport
-pub struct H2ServiceHandler<T, S, B> {
-    srv: S,
+pub struct H2ServiceHandler<T, S: 'static, B> {
+    srv: CloneableService<S>,
     cfg: ServiceConfig,
     _t: PhantomData<(T, B)>,
 }
 
 impl<T, S, B> H2ServiceHandler<T, S, B>
 where
-    S: Service<Request = Request<Payload>> + Clone + 'static,
+    S: Service<Request = Request<Payload>> + 'static,
     S::Error: Into<Error> + Debug,
     S::Response: Into<Response<B>>,
     B: MessageBody + 'static,
 {
     fn new(cfg: ServiceConfig, srv: S) -> H2ServiceHandler<T, S, B> {
         H2ServiceHandler {
-            srv,
             cfg,
+            srv: CloneableService::new(srv),
             _t: PhantomData,
         }
     }
@@ -281,7 +282,7 @@ where
 impl<T, S, B> Service for H2ServiceHandler<T, S, B>
 where
     T: AsyncRead + AsyncWrite,
-    S: Service<Request = Request<Payload>> + Clone + 'static,
+    S: Service<Request = Request<Payload>> + 'static,
     S::Error: Into<Error> + Debug,
     S::Response: Into<Response<B>>,
     B: MessageBody + 'static,
@@ -309,15 +310,19 @@ where
     }
 }
 
-enum State<T: AsyncRead + AsyncWrite, S: Service, B: MessageBody> {
+enum State<T: AsyncRead + AsyncWrite, S: Service + 'static, B: MessageBody> {
     Incoming(Dispatcher<T, S, B>),
-    Handshake(Option<S>, Option<ServiceConfig>, Handshake<T, Bytes>),
+    Handshake(
+        Option<CloneableService<S>>,
+        Option<ServiceConfig>,
+        Handshake<T, Bytes>,
+    ),
 }
 
 pub struct H2ServiceHandlerResponse<T, S, B>
 where
     T: AsyncRead + AsyncWrite,
-    S: Service<Request = Request<Payload>> + Clone + 'static,
+    S: Service<Request = Request<Payload>> + 'static,
     S::Error: Into<Error> + Debug,
     S::Response: Into<Response<B>>,
     B: MessageBody + 'static,
@@ -328,7 +333,7 @@ where
 impl<T, S, B> Future for H2ServiceHandlerResponse<T, S, B>
 where
     T: AsyncRead + AsyncWrite,
-    S: Service<Request = Request<Payload>> + Clone,
+    S: Service<Request = Request<Payload>> + 'static,
     S::Error: Into<Error> + Debug,
     S::Response: Into<Response<B>>,
     B: MessageBody,
diff --git a/src/request.rs b/src/request.rs
index 0064de4e0..b9c35c7ac 100644
--- a/src/request.rs
+++ b/src/request.rs
@@ -153,15 +153,6 @@ impl<Payload> Request<Payload> {
         }
         self.head().method == Method::CONNECT
     }
-
-    // #[doc(hidden)]
-    // /// Note: this method should be called only as part of clone operation
-    // /// of wrapper type.
-    // pub fn clone_request(&self) -> Self {
-    //     Request {
-    //         inner: self.inner.clone(),
-    //     }
-    // }
 }
 
 impl<Payload> fmt::Debug for Request<Payload> {