Author: markt
Date: Wed Jun 24 11:58:57 2015
New Revision: 1687242
URL: http://svn.apache.org/r1687242
Log:
Differentiate between failure modes. Handling is currently identical but it
won't be once BZ 58031 is addressed.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1687242&r1=1687241&r2=1687242&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Wed Jun 24
11:58:57 2015
@@ -3046,8 +3046,17 @@ public class Request
byte[] formData = null;
try {
formData = readChunkedPostBody();
+ } catch (IllegalStateException ise) {
+ // chunkedPostTooLarge error
+ Context context = getContext();
+ if (context != null &&
context.getLogger().isDebugEnabled()) {
+ context.getLogger().debug(
+ sm.getString("coyoteRequest.parseParameters"),
+ ise);
+ }
+ return;
} catch (IOException e) {
- // Client disconnect or chunkedPostTooLarge error
+ // Client disconnect
Context context = getContext();
if (context != null &&
context.getLogger().isDebugEnabled()) {
context.getLogger().debug(
@@ -3104,7 +3113,7 @@ public class Request
(body.getLength() + len) > connector.getMaxPostSize()) {
// Too much data
checkSwallowInput();
- throw new IOException(
+ throw new IllegalStateException(
sm.getString("coyoteRequest.chunkedPostTooLarge"));
}
if (len > 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
