Author: markt
Date: Wed Mar 6 20:54:54 2013
New Revision: 1453553
URL: http://svn.apache.org/r1453553
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54628
Only write data from start position in array rather than start of array.
Patch provide by blee.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1453549
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java?rev=1453553&r1=1453552&r2=1453553&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java Wed
Mar 6 20:54:54 2013
@@ -399,7 +399,8 @@ public class WsOutbound {
}
// Write the content
- upgradeOutbound.write(buffer.array(), 0, buffer.limit());
+ upgradeOutbound.write(buffer.array(), buffer.arrayOffset(),
+ buffer.limit());
upgradeOutbound.flush();
// Reset
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1453553&r1=1453552&r2=1453553&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Mar 6 20:54:54 2013
@@ -114,6 +114,11 @@
restoring the original request preventing possible hanging when
restoring POST requests submitted over AJP. (markt)
</fix>
+ <fix>
+ <bug>54628</bug>: When writing binary WebSocket messages write from
+ start position in array rather than the start of the array. Patch
+ provided by blee. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
