From d86fd6572c878ad3ea4b3b30dc98557702ed3632 Mon Sep 17 00:00:00 2001
From: dentinyhao <dentinyhao@gmail.com>
Date: Tue, 31 Mar 2026 04:11:20 -0700
Subject: [PATCH] fix(compression): fix compression encoding consider enabled

---
 tonic/src/codec/compression.rs | 47 +++++++++++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/tonic/src/codec/compression.rs b/tonic/src/codec/compression.rs
index e82da1b11..7728c2ac9 100644
--- a/tonic/src/codec/compression.rs
+++ b/tonic/src/codec/compression.rs
@@ -118,11 +118,17 @@ impl CompressionEncoding {
 
         split_by_comma(header_value_str).find_map(|value| match value {
             #[cfg(feature = "gzip")]
-            "gzip" => Some(CompressionEncoding::Gzip),
+            "gzip" if enabled_encodings.is_enabled(CompressionEncoding::Gzip) => {
+                Some(CompressionEncoding::Gzip)
+            }
             #[cfg(feature = "deflate")]
-            "deflate" => Some(CompressionEncoding::Deflate),
+            "deflate" if enabled_encodings.is_enabled(CompressionEncoding::Deflate) => {
+                Some(CompressionEncoding::Deflate)
+            }
             #[cfg(feature = "zstd")]
-            "zstd" => Some(CompressionEncoding::Zstd),
+            "zstd" if enabled_encodings.is_enabled(CompressionEncoding::Zstd) => {
+                Some(CompressionEncoding::Zstd)
+            }
             _ => None,
         })
     }
@@ -357,6 +363,41 @@ mod tests {
         assert_eq!(encodings.into_accept_encoding_header_value().unwrap(), ZSTD);
     }
 
+    #[test]
+    fn accept_encoding_returns_none_when_no_encodings_enabled() {
+        let mut map = http::HeaderMap::new();
+        map.insert(ACCEPT_ENCODING_HEADER, "gzip,deflate,zstd".parse().unwrap());
+
+        let enabled = EnabledCompressionEncodings::default();
+        assert!(CompressionEncoding::from_accept_encoding_header(&map, enabled).is_none());
+    }
+
+    #[test]
+    fn accept_encoding_returns_none_when_header_missing() {
+        let map = http::HeaderMap::new();
+
+        let mut enabled = EnabledCompressionEncodings::default();
+        #[cfg(feature = "gzip")]
+        enabled.enable(CompressionEncoding::Gzip);
+
+        assert!(CompressionEncoding::from_accept_encoding_header(&map, enabled).is_none());
+    }
+
+    #[test]
+    #[cfg(feature = "gzip")]
+    fn accept_encoding_picks_enabled_encoding() {
+        let mut map = http::HeaderMap::new();
+        map.insert(ACCEPT_ENCODING_HEADER, "gzip".parse().unwrap());
+
+        let mut enabled = EnabledCompressionEncodings::default();
+        enabled.enable(CompressionEncoding::Gzip);
+
+        assert_eq!(
+            CompressionEncoding::from_accept_encoding_header(&map, enabled),
+            Some(CompressionEncoding::Gzip),
+        );
+    }
+
     #[test]
     #[cfg(all(feature = "gzip", feature = "deflate", feature = "zstd"))]
     fn convert_compression_encodings_into_header_value() {