add cancel to timer

http/src/builder.rs

@@ -210,6 +210,6 @@ where
     async fn call(&self, res: Result<S, E>) -> Result<Self::Response, Self::Error> {
         let service = res.map_err(|e| Box::new(e) as Error)?;
         let tls_acceptor = self.tls_factory.call(()).await.map_err(|e| Box::new(e) as Error)?;
-        Ok(HttpService::new(self.config, service, tls_acceptor))
+        Ok(HttpService::new(self.config.clone(), service, tls_acceptor))
     }
 }

http/src/config.rs

@@ -19,7 +19,7 @@ pub const DEFAULT_WRITE_BUF_LIMIT: usize = 8192 + 4096 * 100;
 /// 64 chosen for no particular reason.
 pub const DEFAULT_HEADER_LIMIT: usize = 64;
 
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct HttpServiceConfig<
     const HEADER_LIMIT: usize = DEFAULT_HEADER_LIMIT,
     const READ_BUF_LIMIT: usize = DEFAULT_READ_BUF_LIMIT,

http/src/h1/builder.rs

@@ -72,6 +72,6 @@ where
     async fn call(&self, res: Result<S, E>) -> Result<Self::Response, Self::Error> {
         let service = res.map_err(|e| Box::new(e) as Error)?;
         let tls_acceptor = self.tls_factory.call(()).await.map_err(|e| Box::new(e) as Error)?;
-        Ok(H1Service::new(self.config, service, tls_acceptor))
+        Ok(H1Service::new(self.config.clone(), service, tls_acceptor))
     }
 }

http/src/h1/dispatcher.rs

@@ -21,7 +21,7 @@ use crate::{
     date::DateTime,
     h1::error::Error,
     http::{StatusCode, response::Response},
-    util::timer::{KeepAlive, Timeout},
+    util::timer::{KeepAlive, KeepAliveOutput, Timeout},
 };
 
 use super::{
@@ -98,7 +98,8 @@ where
                         break Ok(());
                     }
                 }
-                Err(_) => break Err(dispatcher.timer.map_to_err()),
+                Err(KeepAliveOutput::Cancel) => break Ok(()),
+                Err(KeepAliveOutput::Expire) => break Err(dispatcher.timer.map_to_err()),
             }
         };
 

http/src/h1/service.rs

@@ -45,7 +45,7 @@ where
             addr,
             crate::bytes::BytesMut::new(),
             timer,
-            self.config,
+            self.config.clone(),
             &self.service,
             self.date.get(),
         )

http/src/h2/builder.rs

@@ -71,6 +71,6 @@ where
     async fn call(&self, res: Result<S, E>) -> Result<Self::Response, Self::Error> {
         let service = res.map_err(|e| Box::new(e) as Error)?;
         let tls_acceptor = self.tls_factory.call(()).await.map_err(|e| Box::new(e) as Error)?;
-        Ok(H2Service::new(self.config, service, tls_acceptor))
+        Ok(H2Service::new(self.config.clone(), service, tls_acceptor))
     }
 }

http/src/service.rs

@@ -196,7 +196,7 @@ where
                 _addr,
                 _read_buf,
                 _timer.as_mut(),
-                self.config,
+                self.config.clone(),
                 &self.service,
                 self.date.get(),
             )

http/src/util/timer.rs

@@ -28,7 +28,7 @@ pin_project! {
 }
 
 impl<F: Future> Future for TimeoutFuture<'_, F> {
-    type Output = Result<F::Output, ()>;
+    type Output = Result<F::Output, KeepAliveOutput>;
 
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.project();
@@ -79,17 +79,25 @@ impl KeepAlive {
 }
 
 impl Future for KeepAlive {
-    type Output = ();
+    type Output = KeepAliveOutput;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.as_mut().project();
         ready!(this.timer.poll(cx));
 
         if self.is_expired() {
-            Poll::Ready(())
+            Poll::Ready(KeepAliveOutput::Expire)
         } else {
             self.as_mut().reset();
             self.poll(cx)
         }
     }
 }
+
+/// return type of timer when it's finished
+pub enum KeepAliveOutput {
+    /// Timer is canceled by foreign input
+    Cancel,
+    /// Timer is explired
+    Expire,
+}

web/src/server.rs

@@ -197,7 +197,7 @@ where
         ResB: Body<Data = Bytes> + 'static,
         ResB::Error: fmt::Debug + 'static,
     {
-        let http = HttpServiceBuilder::with_config(self.config);
+        let http = HttpServiceBuilder::with_config(self.config.clone());
         let service = self.service.clone();
         let name = "xitca-web";
 
@@ -226,7 +226,7 @@ where
         ResB::Error: fmt::Debug + 'static,
         L: IntoListener + 'static,
     {
-        let http = HttpServiceBuilder::with_config(self.config);
+        let http = HttpServiceBuilder::with_config(self.config.clone());
         let service = self.service.clone();
         let name = "xitca-web";
 
@@ -259,7 +259,7 @@ where
         ResB: Body<Data = Bytes> + 'static,
         ResB::Error: fmt::Debug + 'static,
     {
-        let config = self.config;
+        let config = self.config.clone();
 
         const H11: &[u8] = b"\x08http/1.1";
 
@@ -323,7 +323,7 @@ where
         ResB: Body<Data = Bytes> + 'static,
         ResB::Error: fmt::Debug + 'static,
     {
-        let service_config = self.config;
+        let service_config = self.config.clone();
 
         #[cfg(feature = "http2")]
         config.alpn_protocols.push("h2".into());
@@ -361,7 +361,7 @@ where
         ResB: Body<Data = Bytes> + 'static,
         ResB::Error: fmt::Debug + 'static,
     {
-        let http = HttpServiceBuilder::with_config(self.config);
+        let http = HttpServiceBuilder::with_config(self.config.clone());
         let name = "xitca-web";
         let service = self.service.clone();
         self.builder = if self.enable_io_uring {
@@ -396,7 +396,7 @@ where
         let service = self
             .service
             .clone()
-            .enclosed(HttpServiceBuilder::with_config(self.config));
+            .enclosed(HttpServiceBuilder::with_config(self.config.clone()));
 
         self.builder = self.builder.bind_h3("xitca-web", addr, config, service)?;
         Ok(self)