This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 0113948270 69575: Avoid using compression if a response is already
compressed
0113948270 is described below
commit 01139482700c1a850bec9d5efea93a778615b211
Author: remm <r...@apache.org>
AuthorDate: Tue Feb 18 17:09:38 2025 +0100
69575: Avoid using compression if a response is already compressed
Adds compress, deflate and zstd.
---
java/org/apache/coyote/CompressionConfig.java | 3 ++-
webapps/docs/changelog.xml | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/CompressionConfig.java
b/java/org/apache/coyote/CompressionConfig.java
index b4bd64c3a2..d4b27f3a5d 100644
--- a/java/org/apache/coyote/CompressionConfig.java
+++ b/java/org/apache/coyote/CompressionConfig.java
@@ -208,7 +208,8 @@ public class CompressionConfig {
log.warn(sm.getString("compressionConfig.ContentEncodingParseFail"), e);
return false;
}
- if (tokens.contains("gzip") || tokens.contains("br")) {
+ if (tokens.contains("gzip") || tokens.contains("compress") ||
tokens.contains("deflate")
+ || tokens.contains("br") || tokens.contains("zstd")) {
return false;
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3609f19aa8..e4348106aa 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -169,6 +169,11 @@
(remm)
</update>
<!-- Entries for backport and removal before 12.0.0-M1 below this line
-->
+ <fix>
+ <bug>69575</bug>: Avoid using compression if a response is already
+ compressed using <code>compress</code>, <code>deflate</code> or
+ <code>zstd</code>. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
