Author: markt
Date: Thu Feb 15 14:25:33 2018
New Revision: 1824311
URL: http://svn.apache.org/viewvc?rev=1824311&view=rev
Log:
Correct regression in r1824297
Modified:
tomcat/trunk/java/org/apache/coyote/CompressionConfig.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/CompressionConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/CompressionConfig.java?rev=1824311&r1=1824310&r2=1824311&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/CompressionConfig.java (original)
+++ tomcat/trunk/java/org/apache/coyote/CompressionConfig.java Thu Feb 15
14:25:33 2018
@@ -188,8 +188,9 @@ public class CompressionConfig {
// Check if content is not already compressed
MessageBytes contentEncodingMB =
responseHeaders.getValue("Content-Encoding");
- if ((contentEncodingMB != null) && (contentEncodingMB.indexOf("gzip")
!= -1) &&
- (contentEncodingMB.indexOf("br") != -1)) {
+ if (contentEncodingMB != null &&
+ (contentEncodingMB.indexOf("gzip") != -1 ||
+ contentEncodingMB.indexOf("br") != -1)) {
return false;
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1824311&r1=1824310&r2=1824311&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Feb 15 14:25:33 2018
@@ -62,7 +62,8 @@
</add>
<fix>
Prevent Tomcat from applying gzip compression to content that is
already
- compressed with brotli compression. Patch provided by burka. (markt)
+ compressed with brotli compression. Based on a patch provided by burka.
+ (markt)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
