Author: fhanik
Date: Fri Aug 24 12:32:34 2007
New Revision: 569485
URL: http://svn.apache.org/viewvc?rev=569485&view=rev
Log:
Added support for when the buffers are sized very similarly
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=569485&r1=569484&r2=569485&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Fri Aug
24 12:32:34 2007
@@ -841,6 +841,9 @@
socket.getIOChannel().socket().setSoTimeout((int)timeout);
}
} catch (IOException e) {
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("http11processor.header.parse"), e);
+ }
error = true;
break;
} catch (Throwable t) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=569485&r1=569484&r2=569485&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Fri Aug
24 12:32:34 2007
@@ -370,6 +370,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]
