tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1221478 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/catalina/connector/Request.java container/webapps/docs/changelog.xml
Date Tue, 20 Dec 2011 20:24:01 GMT
Author: markt
Date: Tue Dec 20 20:24:01 2011
New Revision: 1221478

URL: http://svn.apache.org/viewvc?rev=1221478&view=rev
Log:
Do not throw IllegalArgumentException from parseParameters() call when chunked POST request
is too large, but treat it like an IO error.

Modified:
    tomcat/tc5.5.x/trunk/STATUS.txt
    tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java
    tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1221478&r1=1221477&r2=1221478&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Dec 20 20:24:01 2011
@@ -24,13 +24,6 @@ $Id$
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK/OTHER:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-* Do not throw IllegalArgumentException from parseParameters() call when
-  chunked POST request is too large, but treat it like an IO error.
-  http://svn.apache.org/viewvc?rev=1206200&view=rev
-  (without tests; it is r1206205 in TC7)
-  +1: kkolinko, markt,funkman, jim
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52335
   Only handle <\% and not \% as escaped in template text.
   http://svn.apache.org/viewvc?rev=1215121&view=rev

Modified: tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java?rev=1221478&r1=1221477&r2=1221478&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java
(original)
+++ tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java
Tue Dec 20 20:24:01 2011
@@ -2521,7 +2521,7 @@ public class Request
                 try {
                     formData = readChunkedPostBody();
                 } catch (IOException e) {
-                    // Client disconnect
+                    // Client disconnect or chunkedPostTooLarge error
                     if (context.getLogger().isDebugEnabled()) {
                         context.getLogger().debug(
                                 sm.getString("coyoteRequest.parseParameters"), e);
@@ -2575,7 +2575,7 @@ public class Request
             if (connector.getMaxPostSize() > 0 &&
                     (body.getLength() + len) > connector.getMaxPostSize()) {
                 // Too much data
-                throw new IllegalArgumentException(
+                throw new IOException(
                         sm.getString("coyoteRequest.chunkedPostTooLarge"));
             }
             if (len > 0) {

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1221478&r1=1221477&r2=1221478&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Dec 20 20:24:01 2011
@@ -46,6 +46,11 @@
         <bug>52225</bug>: Fix ClassCastException when adding an alias for an
         existing host via JMX. (kkolinko)
       </fix>
+      <fix>
+        Do not throw an IllegalArgumentException from a
+        <code>parseParameters()</code> call when a chunked POST request is too
+        large, but treat it like an IO error. (kkolinko)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="General">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message