Remove Control::Connection

ntex-rs · Feb 7, 2024 · 68e158d · 68e158d
1 parent a8447b1
commit 68e158d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 52 deletions.
diff --git a/ntex/src/http/h1/control.rs b/ntex/src/http/h1/control.rs
@@ -2,11 +2,9 @@ use std::{future::Future, io};
 
 use crate::http::message::CurrentIo;
 use crate::http::{body::Body, h1::Codec, Request, Response, ResponseError};
-use crate::io::{Filter, Io, IoBoxed, IoRef};
+use crate::io::{Filter, Io, IoBoxed};
 
 pub enum Control<F, Err> {
-    /// New connection
-    NewConnection(Connection),
     /// New request is loaded
     NewRequest(NewRequest),
     /// Handle `Connection: UPGRADE`
@@ -74,10 +72,6 @@ impl<F, Err> Control<F, Err> {
         Control::NewRequest(NewRequest(req))
     }
 
-    pub(super) fn con(io: IoRef) -> Self {
-        Control::NewConnection(Connection { io })
-    }
-
     pub(super) fn upgrade(req: Request, io: Io<F>, codec: Codec) -> Self {
         Control::Upgrade(Upgrade { req, io, codec })
     }
@@ -102,7 +96,6 @@ impl<F, Err> Control<F, Err> {
         Err: ResponseError,
     {
         match self {
-            Control::NewConnection(msg) => msg.ack(),
             Control::NewRequest(msg) => msg.ack(),
             Control::Upgrade(msg) => msg.ack(),
             Control::Expect(msg) => msg.ack(),
@@ -114,37 +107,6 @@ impl<F, Err> Control<F, Err> {
     }
 }
 
-#[derive(Debug)]
-pub struct Connection {
-    io: IoRef,
-}
-
-impl Connection {
-    #[inline]
-    /// Returns reference to Io
-    pub fn io(&self) -> &IoRef {
-        &self.io
-    }
-
-    #[inline]
-    /// Ack and continue handling process
-    pub fn ack(self) -> ControlAck {
-        ControlAck {
-            result: ControlResult::Stop,
-            flags: ControlFlags::empty(),
-        }
-    }
-
-    #[inline]
-    /// Drop connection
-    pub fn disconnect(self) -> ControlAck {
-        ControlAck {
-            result: ControlResult::Stop,
-            flags: ControlFlags::DISCONNECT,
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct NewRequest(Request);
 

diff --git a/ntex/src/http/h1/service.rs b/ntex/src/http/h1/service.rs
@@ -255,19 +255,8 @@ where
             io.query::<types::PeerAddr>().get()
         );
 
-        let ack = self
-            .config
-            .control
-            .call_nowait(Control::con(io.get_ref()))
+        Dispatcher::new(io, self.config.clone())
             .await
-            .map_err(|e| DispatchError::Control(e.into()))?;
-
-        if ack.flags.contains(super::control::ControlFlags::DISCONNECT) {
-            Ok(())
-        } else {
-            Dispatcher::new(io, self.config.clone())
-                .await
-                .map_err(DispatchError::Control)
-        }
+            .map_err(DispatchError::Control)
     }
 }