You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/10/08 21:18:49 UTC
svn commit: r1530399 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java
Author: markt
Date: Tue Oct 8 19:18:49 2013
New Revision: 1530399
URL: http://svn.apache.org/r1530399
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55638
Fix the corruption of large WebSocket messages when using the NIO connector.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1530397
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java?rev=1530399&r1=1530398&r2=1530399&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java Tue Oct 8 19:18:49 2013
@@ -59,6 +59,7 @@ public class NioServletOutputStream exte
writtenThisLoop = doWriteInternal(block, b, offset, writeThisLoop);
count += writtenThisLoop;
+ offset += writtenThisLoop;
leftToWrite -= writtenThisLoop;
if (writtenThisLoop < writeThisLoop) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org