From 59eedcc51c0a435c22d3d6d59b22d3fdc210e416 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Wed, 29 Dec 2021 01:55:09 +0600
Subject: [PATCH] Cleanup internal flags on io error

---
 ntex-io/CHANGES.md    |  4 ++++
 ntex-io/src/filter.rs |  1 -
 ntex-io/src/io.rs     | 23 ++++++++++++++++-------
 ntex-io/src/ioref.rs  |  6 +-----
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/ntex-io/CHANGES.md b/ntex-io/CHANGES.md
index 01691724..472186c1 100644
--- a/ntex-io/CHANGES.md
+++ b/ntex-io/CHANGES.md
@@ -1,5 +1,9 @@
 # Changes
 
+## [0.1.0-b.10] - 2021-12-xx
+
+* Cleanup internal flags on io error
+
 ## [0.1.0-b.9] - 2021-12-29
 
 * Add `async-std` support
diff --git a/ntex-io/src/filter.rs b/ntex-io/src/filter.rs
index 65092a50..40421eb0 100644
--- a/ntex-io/src/filter.rs
+++ b/ntex-io/src/filter.rs
@@ -18,7 +18,6 @@ impl Filter for Base {
     fn closed(&self, err: Option<io::Error>) {
         self.0 .0.set_error(err);
         self.0 .0.handle.take();
-        self.0 .0.insert_flags(Flags::IO_CLOSED);
         self.0 .0.dispatch_task.wake();
     }
 
diff --git a/ntex-io/src/io.rs b/ntex-io/src/io.rs
index ac3f3c99..c6d558ee 100644
--- a/ntex-io/src/io.rs
+++ b/ntex-io/src/io.rs
@@ -21,8 +21,6 @@ bitflags::bitflags! {
         const IO_FILTERS_TO   = 0b0000_0000_0000_0100;
         /// shutdown io tasks
         const IO_SHUTDOWN     = 0b0000_0000_0000_1000;
-        /// io object is closed
-        const IO_CLOSED       = 0b0000_0000_0001_0000;
 
         /// pause io read
         const RD_PAUSED       = 0b0000_0000_0010_0000;
@@ -107,9 +105,10 @@ impl IoState {
 
     #[inline]
     pub(super) fn is_io_open(&self) -> bool {
-        !self.flags.get().intersects(
-            Flags::IO_ERR | Flags::IO_SHUTDOWN | Flags::IO_SHUTDOWN | Flags::IO_CLOSED,
-        )
+        !self
+            .flags
+            .get()
+            .intersects(Flags::IO_ERR | Flags::IO_SHUTDOWN)
     }
 
     #[inline]
@@ -120,8 +119,18 @@ impl IoState {
         self.read_task.wake();
         self.write_task.wake();
         self.dispatch_task.wake();
-        self.insert_flags(Flags::IO_ERR);
         self.notify_disconnect();
+        let mut flags = self.flags.get();
+        flags.insert(Flags::IO_ERR);
+        flags.remove(
+            Flags::DSP_KEEPALIVE
+                | Flags::RD_PAUSED
+                | Flags::RD_READY
+                | Flags::RD_BUF_FULL
+                | Flags::WR_WAIT
+                | Flags::WR_BACKPRESSURE,
+        );
+        self.flags.set(flags);
     }
 
     #[inline]
@@ -617,7 +626,7 @@ impl<F> Io<F> {
     pub fn poll_shutdown(&self, cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
         let flags = self.flags();
 
-        if flags.intersects(Flags::IO_ERR | Flags::IO_CLOSED) {
+        if flags.intersects(Flags::IO_ERR) {
             Poll::Ready(Ok(()))
         } else {
             if !flags.contains(Flags::IO_FILTERS) {
diff --git a/ntex-io/src/ioref.rs b/ntex-io/src/ioref.rs
index 28b25d73..135d1d68 100644
--- a/ntex-io/src/ioref.rs
+++ b/ntex-io/src/ioref.rs
@@ -48,11 +48,7 @@ impl IoRef {
     /// Check if io stream is closed
     pub fn is_closed(&self) -> bool {
         self.0.flags.get().intersects(
-            Flags::IO_ERR
-                | Flags::IO_SHUTDOWN
-                | Flags::IO_CLOSED
-                | Flags::IO_FILTERS
-                | Flags::DSP_STOP,
+            Flags::IO_ERR | Flags::IO_SHUTDOWN | Flags::IO_FILTERS | Flags::DSP_STOP,
         )
     }