From 175b7d4293f39c5368899d64dae44f0fc93845a1 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 30 Nov 2007 19:13:33 +0000 Subject: [PATCH] Fix bug 43622. Don't overwrite the min compression size set by the compression attribute with the default. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@599914 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/http11/Http11AprProtocol.java | 2 +- java/org/apache/coyote/http11/Http11NioProtocol.java | 2 +- java/org/apache/coyote/http11/Http11Protocol.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java b/java/org/apache/coyote/http11/Http11AprProtocol.java index 20cf364a2..fe9145d06 100644 --- a/java/org/apache/coyote/http11/Http11AprProtocol.java +++ b/java/org/apache/coyote/http11/Http11AprProtocol.java @@ -606,8 +606,8 @@ public class Http11AprProtocol implements ProtocolHandler, MBeanRegistration { processor.setMaxKeepAliveRequests(proto.maxKeepAliveRequests); processor.setTimeout(proto.timeout); processor.setDisableUploadTimeout(proto.disableUploadTimeout); - processor.setCompression(proto.compression); processor.setCompressionMinSize(proto.compressionMinSize); + processor.setCompression(proto.compression); processor.setNoCompressionUserAgents(proto.noCompressionUserAgents); processor.setCompressableMimeTypes(proto.compressableMimeTypes); processor.setRestrictedUserAgents(proto.restrictedUserAgents); diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java index 3bc926cd9..567002d60 100644 --- a/java/org/apache/coyote/http11/Http11NioProtocol.java +++ b/java/org/apache/coyote/http11/Http11NioProtocol.java @@ -769,8 +769,8 @@ public class Http11NioProtocol implements ProtocolHandler, MBeanRegistration processor.setMaxKeepAliveRequests(proto.maxKeepAliveRequests); processor.setTimeout(proto.timeout); processor.setDisableUploadTimeout(proto.disableUploadTimeout); - processor.setCompression(proto.compression); processor.setCompressionMinSize(proto.compressionMinSize); + processor.setCompression(proto.compression); processor.setNoCompressionUserAgents(proto.noCompressionUserAgents); processor.setCompressableMimeTypes(proto.compressableMimeTypes); processor.setRestrictedUserAgents(proto.restrictedUserAgents); diff --git a/java/org/apache/coyote/http11/Http11Protocol.java b/java/org/apache/coyote/http11/Http11Protocol.java index 23f65a9e9..ff50b50b6 100644 --- a/java/org/apache/coyote/http11/Http11Protocol.java +++ b/java/org/apache/coyote/http11/Http11Protocol.java @@ -623,8 +623,8 @@ public class Http11Protocol processor.setKeepAliveTimeout(proto.keepAliveTimeout); processor.setTimeout(proto.timeout); processor.setDisableUploadTimeout(proto.disableUploadTimeout); - processor.setCompression(proto.compression); processor.setCompressionMinSize(proto.compressionMinSize); + processor.setCompression(proto.compression); processor.setNoCompressionUserAgents(proto.noCompressionUserAgents); processor.setCompressableMimeTypes(proto.compressableMimeTypes); processor.setRestrictedUserAgents(proto.restrictedUserAgents); -- 2.11.0