Author: fhanik
Date: Fri Aug 24 12:35:40 2007
New Revision: 569489
URL: http://svn.apache.org/viewvc?rev=569489&view=rev
Log:
backport from trunk, correct solution is to expand the buffer, but that can
lead to overly large buffers, we want the the size the developers specified for
predictability
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=569489&r1=569488&r2=569489&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
Fri Aug 24 12:35:40 2007
@@ -369,6 +369,10 @@
if (unwrap.getHandshakeStatus() == HandshakeStatus.NEED_TASK)
tasks();
//if we need more network data, then bail out for now.
if ( unwrap.getStatus() == Status.BUFFER_UNDERFLOW ) break;
+ }else if ( unwrap.getStatus()==Status.BUFFER_OVERFLOW && read>0 ) {
+ //buffer overflow can happen, if we have read data, then
+ //empty out the dst buffer before we do another read
+ break;
}else {
//here we should trap BUFFER_OVERFLOW and call expand on the
buffer
//for now, throw an exception, as we initialized the buffers
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
