Re-instate Rainer's code that fixes the 44494 test case for read with maxHttpHeaderSi...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@647304 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/connector/InputBuffer.java b/java/org/apache/catalina/connector/InputBuffer.java
index f60dfc4..3859d6f 100644 (file)
--- a/java/org/apache/catalina/connector/InputBuffer.java
+++ b/java/org/apache/catalina/connector/InputBuffer.java
@@ -348,7 +348,9 @@ public class InputBuffer extends Reader
             cb.setOffset(0);
             cb.setEnd(0);
         }
-
+        int limit = bb.getLength()+cb.getStart();
+        if ( cb.getLimit() < limit )
+            cb.setLimit(limit);
         state = CHAR_STATE;
         conv.convert(bb, cb, bb.getLength());
         bb.setOffset(bb.getEnd());