Author: markt
Date: Tue May 8 20:07:23 2012
New Revision: 1335733
URL: http://svn.apache.org/viewvc?rev=1335733&view=rev
Log:
Ensure maxParameterCount applies to multi-part requests handled via Servlet 3.0
file upload
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1335731
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1335733&r1=1335732&r2=1335733&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java Tue
May 8 20:07:23 2012
@@ -2665,6 +2665,7 @@ public class Request
}
Parameters parameters = coyoteRequest.getParameters();
+ parameters.setLimit(getConnector().getMaxParameterCount());
boolean success = false;
try {
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=1335733&r1=1335732&r2=1335733&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue May 8 20:07:23 2012
@@ -100,6 +100,10 @@
Make sure ContextMBean#findFilterDefs returns correct filter
definitions. (kfujino)
</fix>
+ <add>
+ Ensure that <code>maxParameterCount</code> applies to multi-part
+ requests handled via the Servlet 3 file upload API. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
