Author: markt
Date: Thu Mar 23 13:52:22 2017
New Revision: 1788241
URL: http://svn.apache.org/viewvc?rev=1788241&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60852
Correct spelling of compressible
Based on a patch by Michael Osipov
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1788241&r1=1788240&r2=1788241&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
Mar 23 13:52:22 2017
@@ -244,20 +244,44 @@ public abstract class AbstractHttp11Prot
}
- private String compressableMimeType =
"text/html,text/xml,text/plain,text/css,text/javascript,application/javascript";
- private String[] compressableMimeTypes = null;
- public String getCompressableMimeType() { return compressableMimeType; }
+ /**
+ * @return See {@link #getCompressableMimeType()}
+ * @deprecated Use {@link #getCompressableMimeType()}
+ */
+ @Deprecated
+ public String getCompressableMimeType() {
+ return getCompressibleMimeType();
+ }
+ /**
+ * @param valueS See {@link #setCompressableMimeType(String)}
+ * @deprecated Use {@link #setCompressableMimeType(String)}
+ */
+ @Deprecated
public void setCompressableMimeType(String valueS) {
- compressableMimeType = valueS;
- compressableMimeTypes = null;
+ setCompressibleMimeType(valueS);
}
+ /**
+ * @return See {@link #getCompressableMimeTypes()}
+ * @deprecated Use {@link #getCompressableMimeTypes()}
+ */
+ @Deprecated
public String[] getCompressableMimeTypes() {
- String[] result = compressableMimeTypes;
+ return getCompressibleMimeTypes();
+ }
+ private String compressibleMimeType =
"text/html,text/xml,text/plain,text/css,text/javascript,application/javascript";
+ private String[] compressibleMimeTypes = null;
+ public String getCompressibleMimeType() { return compressibleMimeType; }
+ public void setCompressibleMimeType(String valueS) {
+ compressibleMimeType = valueS;
+ compressibleMimeTypes = null;
+ }
+ public String[] getCompressibleMimeTypes() {
+ String[] result = compressibleMimeTypes;
if (result != null) {
return result;
}
List<String> values = new ArrayList<>();
- StringTokenizer tokens = new StringTokenizer(compressableMimeType,
",");
+ StringTokenizer tokens = new StringTokenizer(compressibleMimeType,
",");
while (tokens.hasMoreTokens()) {
String token = tokens.nextToken().trim();
if (token.length() > 0) {
@@ -265,7 +289,7 @@ public abstract class AbstractHttp11Prot
}
}
result = values.toArray(new String[values.size()]);
- compressableMimeTypes = result;
+ compressibleMimeTypes = result;
return result;
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1788241&r1=1788240&r2=1788241&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Thu Mar 23
13:52:22 2017
@@ -206,7 +206,7 @@ public class Http11Processor extends Abs
/**
* Check if the resource could be compressed, if the client supports it.
*/
- private boolean isCompressable() {
+ private boolean isCompressible() {
// Check if content is not already gzipped
MessageBytes contentEncodingMB =
response.getMimeHeaders().getValue("Content-Encoding");
@@ -224,9 +224,9 @@ public class Http11Processor extends Abs
long contentLength = response.getContentLengthLong();
if ((contentLength == -1) || (contentLength >
protocol.getCompressionMinSize())) {
// Check for compatible MIME-TYPE
- String[] compressableMimeTypes =
protocol.getCompressableMimeTypes();
- if (compressableMimeTypes != null) {
- return (startsWithStringArray(compressableMimeTypes,
response.getContentType()));
+ String[] compressibleMimeTypes =
protocol.getCompressibleMimeTypes();
+ if (compressibleMimeTypes != null) {
+ return (startsWithStringArray(compressibleMimeTypes,
response.getContentType()));
}
}
@@ -864,11 +864,11 @@ public class Http11Processor extends Abs
}
// Check for compression
- boolean isCompressable = false;
+ boolean isCompressible = false;
boolean useCompression = false;
if (entityBody && (protocol.getCompressionLevel() > 0) &&
!sendingWithSendfile) {
- isCompressable = isCompressable();
- if (isCompressable) {
+ isCompressible = isCompressible();
+ if (isCompressible) {
useCompression = useCompression();
}
// Change content-length to -1 to force chunking
@@ -921,7 +921,7 @@ public class Http11Processor extends Abs
headers.setValue("Content-Encoding").setString("gzip");
}
// If it might be compressed, set the Vary header
- if (isCompressable) {
+ if (isCompressible) {
// Make Proxies happy via Vary (from mod_deflate)
MessageBytes vary = headers.getValue("Vary");
if (vary == null) {
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1788241&r1=1788240&r2=1788241&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Thu Mar 23 13:52:22 2017
@@ -347,7 +347,7 @@
provider will be used.</p>
</attribute>
- <attribute name="compressableMimeType" required="false">
+ <attribute name="compressibleMimeType" required="false">
<p>The value is a comma separated list of MIME types for which HTTP
compression may be used.
The default value is
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
