Add payload read timeout (#251)

ntex-rs · Nov 20, 2023 · fda7e41 · fda7e41
1 parent d441e79
commit fda7e41
Show file tree

Hide file tree

Showing 5 changed files with 264 additions and 105 deletions.
diff --git a/ntex-io/src/dispatcher.rs b/ntex-io/src/dispatcher.rs
@@ -537,19 +537,25 @@ where
             // update read timer
             if let Some((_, max, rate)) = self.cfg.frame_read_rate() {
                 let bytes = decoded.remains as u32;
+                let delta = if bytes > self.read_bytes {
+                    (bytes - self.read_bytes).try_into().unwrap_or(u16::MAX)
+                } else {
+                    bytes.try_into().unwrap_or(u16::MAX)
+                };
 
-                let delta = (bytes - self.read_bytes).try_into().unwrap_or(u16::MAX);
-
+                // read rate higher than min rate
                 if delta >= rate {
                     let n = now();
                     let next = self.shared.io.timer_deadline() + ONE_SEC;
                     let new_timeout = if n >= next { ONE_SEC } else { next - n };
 
-                    // max timeout
+                    // extend timeout
                     if max.is_zero() || (n + new_timeout) <= self.read_max_timeout {
-                        self.read_bytes = bytes;
                         self.shared.io.stop_timer();
                         self.shared.io.start_timer(new_timeout);
+
+                        // store current buf size for future rate calculation
+                        self.read_bytes = bytes;
                     }
                 }
             }

diff --git a/ntex-io/src/io.rs b/ntex-io/src/io.rs
@@ -552,7 +552,9 @@ impl<F> Io<F> {
             } else {
                 match self.poll_read_ready(cx) {
                     Poll::Pending | Poll::Ready(Ok(Some(()))) => {
-                        log::debug!("not enough data to decode next frame");
+                        if log::log_enabled!(log::Level::Debug) && decoded.remains != 0 {
+                            log::debug!("not enough data to decode next frame");
+                        }
                         Ok(decoded)
                     }
                     Poll::Ready(Err(e)) => Err(RecvError::PeerGone(Some(e))),

diff --git a/ntex/CHANGES.md b/ntex/CHANGES.md
@@ -1,9 +1,11 @@
 # Changes
 
-## [0.7.11] - 2023-11-xx
+## [0.7.11] - 2023-11-20
 
 * Refactor http/1 timeouts
 
+* Add http/1 payload read timeout
+
 ## [0.7.10] - 2023-11-12
 
 * Start http client timeout after sending body

diff --git a/ntex/src/http/config.rs b/ntex/src/http/config.rs
@@ -275,10 +275,6 @@ impl<S, X, U> DispatcherConfig<S, X, U> {
     pub(super) fn headers_read_rate(&self) -> Option<&ReadRate> {
         self.headers_read_rate.as_ref()
     }
-
-    pub(super) fn payload_read_rate(&self) -> Option<&ReadRate> {
-        self.payload_read_rate.as_ref()
-    }
 }
 
 const DATE_VALUE_LENGTH_HDR: usize = 39;