Author: markt
Date: Tue Jul 30 08:16:59 2013
New Revision: 1508339
URL: http://svn.apache.org/r1508339
Log: (empty)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1487882
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java?rev=1508339&r1=1508338&r2=1508339&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
Tue Jul 30 08:16:59 2013
@@ -224,7 +224,7 @@ public class TestSwallowAbortedUploads e
private static final String URI = "/uploadAborted";
private static final String servletName = "uploadAborted";
private static final int limitSize = 100;
- private static final int hugeSize = 400000;
+ private static final int hugeSize = 2000000;
private boolean init;
private Context context;
@@ -345,7 +345,7 @@ public class TestSwallowAbortedUploads e
private static final String URI = "/uploadAborted";
private static final String servletName = "uploadAborted";
- private static final int hugeSize = 400000;
+ private static final int hugeSize = 2000000;
private boolean init;
private Context context;
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1508339&r1=1508338&r2=1508339&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jul 30 08:16:59 2013
@@ -78,6 +78,11 @@
JARs. Patch provided by Nick Williams. (markt)
</fix>
<fix>
+ <bug>55261</bug>: Fix failing unit test for file upload checks when
+ running on platform / JVM combinations that have large network buffers.
+ (markt)
+ </fix>
+ <fix>
<bug>55268</bug>: Added optional --service-start-wait-time
command-line option to change service s tart wait time from default
of 10 seconds.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
