Author: markt
Date: Wed Dec 14 11:05:18 2016
New Revision: 1774178
URL: http://svn.apache.org/viewvc?rev=1774178&view=rev
Log:
Don't duplicate storage of compressionMinSize in the Processor
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
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=1774178&r1=1774177&r2=1774178&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Wed
Dec 14 11:05:18 2016
@@ -224,8 +224,14 @@ public abstract class AbstractHttp11Prot
private int compressionMinSize = 2048;
public int getCompressionMinSize() { return compressionMinSize; }
- public void setCompressionMinSize(int valueI) {
- compressionMinSize = valueI;
+ /**
+ * Set Minimum size to trigger compression.
+ *
+ * @param compressionMinSize The minimum content length required for
+ * compression in bytes
+ */
+ public void setCompressionMinSize(int compressionMinSize) {
+ this.compressionMinSize = compressionMinSize;
}
@@ -731,7 +737,6 @@ public abstract class AbstractHttp11Prot
protected Processor createProcessor() {
Http11Processor processor = new Http11Processor(this);
processor.setAdapter(getAdapter());
- processor.setCompressionMinSize(getCompressionMinSize());
processor.setCompression(getCompression());
return processor;
}
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=1774178&r1=1774177&r2=1774178&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Wed Dec 14
11:05:18 2016
@@ -135,12 +135,6 @@ public class Http11Processor extends Abs
/**
- * Minimum content size to make compression.
- */
- protected int compressionMinSize = 2048;
-
-
- /**
* Host name (used to avoid useless B2C conversion on the host name).
*/
protected char[] hostNameC = new char[0];
@@ -215,7 +209,7 @@ public class Http11Processor extends Abs
try {
// Try to parse compression as an int, which would give the
// minimum compression size
- compressionMinSize = Integer.parseInt(compression);
+ protocol.setCompressionMinSize(Integer.parseInt(compression));
this.compressionLevel = 1;
} catch (Exception e) {
this.compressionLevel = 0;
@@ -223,16 +217,6 @@ public class Http11Processor extends Abs
}
}
- /**
- * Set Minimum size to trigger compression.
- *
- * @param compressionMinSize The minimum content length required for
- * compression in bytes
- */
- public void setCompressionMinSize(int compressionMinSize) {
- this.compressionMinSize = compressionMinSize;
- }
-
/**
* Return compression level.
@@ -293,7 +277,7 @@ public class Http11Processor extends Abs
// Check if sufficient length to trigger the compression
long contentLength = response.getContentLengthLong();
if ((contentLength == -1)
- || (contentLength > compressionMinSize)) {
+ || (contentLength > protocol.getCompressionMinSize())) {
// Check for compatible MIME-TYPE
String[] compressableMimeTypes =
protocol.getCompressableMimeTypes();
if (compressableMimeTypes != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
