2015-03-07 18:33 GMT+03:00 <ma...@apache.org>: > Author: markt > Date: Sat Mar 7 15:33:01 2015 > New Revision: 1664875 > > URL: http://svn.apache.org/r1664875 > Log: > Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57638 > Avoid an IllegalArgumentException when an AJP request body chunk larger than > the socket read buffer is being read. This typically requires a larger than > default AJP packetSize. > > Modified: > tomcat/tc7.0.x/trunk/ (props changed) > tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java > tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java > tomcat/tc7.0.x/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java > > tomcat/tc7.0.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java > tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml >
> Modified: > tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java > URL: > http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1664875&r1=1664874&r2=1664875&view=diff > ============================================================================== > --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java > (original) > +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java > Sat Mar 7 15:33:01 2015 > @@ -56,6 +56,7 @@ import org.apache.catalina.session.Manag > import org.apache.catalina.session.StandardManager; > import org.apache.catalina.valves.AccessLogValve; > import org.apache.tomcat.util.buf.ByteChunk; > +import org.apache.tomcat.websocket.CaseInsensitiveKeyMap; -1 to the above import. It makes TomcatBaseTest to depend on WebSocket which in turn requires Java 7. One should be able to build and run the tests (minus Websocket) using Java 6. > /** > * Base test case that provides a Tomcat instance for each test - mainly so > we > @@ -208,7 +209,7 @@ public abstract class TomcatBaseTest ext > private final Map<String, String> contextAttributes = > new HashMap<String, String>(); > private final Map<String, String> headers = > - new HashMap<String, String>(); > + new CaseInsensitiveKeyMap<String>(); > private final Map<String, String> attributes = > new HashMap<String, String>(); > private final Map<String, String> params = > @@ -525,6 +526,20 @@ public abstract class TomcatBaseTest ext > (attribute != null ? attribute : "(null)")); > } > } Best regards, Konstantin Kolinko --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
