Suppress EOF errors caused by decompressing empty body

ducaale · ducaale · commit ed1dcbc692a8 · 2025-11-15T19:54:05.000Z
diff --git a/tower-http/src/compression_utils.rs b/tower-http/src/compression_utils.rs
@@ -211,19 +211,24 @@ where
                     return Poll::Ready(Some(Ok(Frame::data(chunk))));
                 }
                 Err(err) => {
-                    let body_error: Option<B::Error> = M::get_pin_mut(this.read)
+                    let body_error: Option<B::Error> = M::get_pin_mut(this.read.as_mut())
                         .get_pin_mut()
                         .project()
                         .error
                         .take();
 
+                    let read_some_data = M::get_pin_mut(this.read.as_mut())
+                        .get_pin_mut()
+                        .project()
+                        .read_some_data;
+
                     if let Some(body_error) = body_error {
                         return Poll::Ready(Some(Err(body_error.into())));
                     } else if err.raw_os_error() == Some(SENTINEL_ERROR_CODE) {
                         // SENTINEL_ERROR_CODE only gets used when storing
                         // an underlying body error
                         unreachable!()
-                    } else {
+                    } else if *read_some_data {
                         return Poll::Ready(Some(Err(err.into())));
                     }
                 }
@@ -359,12 +364,17 @@ pin_project! {
         #[pin]
         inner: S,
         error: Option<E>,
+        read_some_data: bool
     }
 }
 
 impl<S, E> StreamErrorIntoIoError<S, E> {
     pub(crate) fn new(inner: S) -> Self {
-        Self { inner, error: None }
+        Self {
+            inner,
+            error: None,
+            read_some_data: false,
+        }
     }
 
     /// Get a reference to the inner body
@@ -398,7 +408,10 @@ where
         let this = self.project();
         match ready!(this.inner.poll_next(cx)) {
             None => Poll::Ready(None),
-            Some(Ok(value)) => Poll::Ready(Some(Ok(value))),
+            Some(Ok(value)) => {
+                *this.read_some_data = true;
+                Poll::Ready(Some(Ok(value)))
+            }
             Some(Err(err)) => {
                 *this.error = Some(err);
                 Poll::Ready(Some(Err(io::Error::from_raw_os_error(SENTINEL_ERROR_CODE))))
diff --git a/tower-http/src/decompression/mod.rs b/tower-http/src/decompression/mod.rs
@@ -230,4 +230,28 @@ mod tests {
         let _: Response<DecompressionBody<_>> =
             client.ready().await.unwrap().call(req).await.unwrap();
     }
+
+    #[tokio::test]
+    async fn decompress_empty() {
+        let mut client = Decompression::new(Compression::new(service_fn(handle_empty)));
+
+        let req = Request::builder()
+            .header("accept-encoding", "gzip")
+            .body(Body::empty())
+            .unwrap();
+        let res = client.ready().await.unwrap().call(req).await.unwrap();
+
+        let body = res.into_body();
+        let decompressed_data =
+            String::from_utf8(body.collect().await.unwrap().to_bytes().to_vec()).unwrap();
+
+        assert_eq!(decompressed_data, "");
+    }
+
+    async fn handle_empty(_req: Request<Body>) -> Result<Response<Body>, Infallible> {
+        let mut res = Response::new(Body::empty());
+        res.headers_mut()
+            .insert("content-encoding", "gzip".parse().unwrap());
+        Ok(res)
+    }
 }
