diff --git a/src/proto/h1/conn.rs b/src/proto/h1/conn.rs index 6a5bed9fc8..6f9cf1be6e 100644 --- a/src/proto/h1/conn.rs +++ b/src/proto/h1/conn.rs @@ -494,6 +494,10 @@ where debug_assert!(!self.can_read_head() && !self.can_read_body() && !self.is_read_closed()); debug_assert!(self.is_mid_message()); + if !T::is_client() { + self.io.reset_server_read_buffer(); + } + if self.state.allow_half_close || !self.io.read_buf().is_empty() { return Poll::Pending; } diff --git a/src/proto/h1/io.rs b/src/proto/h1/io.rs index f5829a2786..e15dff23ab 100644 --- a/src/proto/h1/io.rs +++ b/src/proto/h1/io.rs @@ -228,6 +228,19 @@ where } } + // Body reads can grow the adaptive buffer to hundreds of KiB. While + // waiting to write a response, the next server read only probes for EOF + // or the start of a pipelined request. + pub(crate) fn reset_server_read_buffer(&mut self) { + if self.read_buf.is_empty() + && (self.read_buf_strategy.next() > INIT_BUFFER_SIZE + || self.read_buf.capacity() > INIT_BUFFER_SIZE) + { + self.read_buf = BytesMut::new(); + self.read_buf_strategy = ReadStrategy::with_max(self.read_buf_strategy.max()); + } + } + pub(crate) fn poll_read_from_io(&mut self, cx: &mut Context<'_>) -> Poll> { self.read_blocked = false; // Get the next amount to allocate, but make sure we don't go over @@ -740,6 +753,26 @@ mod tests { ); } + #[test] + fn server_idle_probe_releases_empty_body_buffer_and_preserves_pipelined_bytes() { + let mock = Mock::new().build(); + let mut buffered = Buffered::<_, Cursor>>::new(Compat::new(mock)); + let max = 16 * INIT_BUFFER_SIZE; + buffered.set_max_buf_size(max); + buffered.read_buf.reserve(max); + buffered.read_buf_strategy.record(INIT_BUFFER_SIZE); + buffered.read_buf.extend_from_slice(b"GET /next"); + + buffered.reset_server_read_buffer(); + assert_eq!(&buffered.read_buf[..], b"GET /next"); + buffered.read_buf.clear(); + + buffered.reset_server_read_buffer(); + assert_eq!(buffered.read_buf.capacity(), 0); + assert_eq!(buffered.read_buf_strategy.next(), INIT_BUFFER_SIZE); + assert_eq!(buffered.read_buf_strategy.max(), max); + } + #[test] fn read_strategy_adaptive_increments() { let mut strategy = ReadStrategy::default();