Author: markt
Date: Sun Jan 6 14:02:55 2008
New Revision: 609423
URL: http://svn.apache.org/viewvc?rev=609423&view=rev
Log:
Fix bug 43622. Don't always overwrite min compression size with default.
Modified:
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11BaseProtocol.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified:
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=609423&r1=609422&r2=609423&view=diff
==============================================================================
---
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java
(original)
+++
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java
Sun Jan 6 14:02:55 2008
@@ -608,8 +608,8 @@
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);
Modified:
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11BaseProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11BaseProtocol.java?rev=609423&r1=609422&r2=609423&view=diff
==============================================================================
---
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11BaseProtocol.java
(original)
+++
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11BaseProtocol.java
Sun Jan 6 14:02:55 2008
@@ -623,8 +623,8 @@
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);
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609423&r1=609422&r2=609423&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan 6 14:02:55 2008
@@ -133,6 +133,10 @@
(markt)
</fix>
<fix>
+ <bug>43622</bug>: Don't always overwrite min compression size with
+ default. (markt)
+ </fix>
+ <fix>
<bug>43995</bug>: No timeout for sendfile (TODO item had been
forgotten). (markt)
</fix>
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609423&r1=609422&r2=609423&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan 6 14:02:55 2008
@@ -47,12 +47,6 @@
-1:
0: fhanik, this needs to be reworked completely, so I'm neutral
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43622
- Don't always overwrite min compression size with default
- http://svn.apache.org/viewvc?rev=599914&view=rev
- +1: markt, pero, fhanik
- -1:
-
* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43611
Provide an error message when trying to upload a war if the context is
defined
in server.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
