tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1453440 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/websocket/WsOutbound.java webapps/docs/changelog.xml
Date Wed, 06 Mar 2013 17:27:23 GMT
Author: markt
Date: Wed Mar  6 17:27:23 2013
New Revision: 1453440

URL: http://svn.apache.org/r1453440
Log:
Control messages can be sent in the middle of a fragmented message.

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:r1453435

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=1453440&r1=1453439&r2=1453440&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 17:27:23
2013
@@ -329,7 +329,7 @@ public class WsOutbound {
             throw new IOException(sm.getString("outbound.closed"));
         }
 
-        doFlush(true);
+        doFlush(false);
 
         upgradeOutbound.write(0x80 | opcode);
         if (data == null) {

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=1453440&r1=1453439&r2=1453440&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Mar  6 17:27:23 2013
@@ -262,6 +262,10 @@
         fully started. Stop the background thread as soon as the web application
         is stopped. (markt)
       </fix>
+      <fix>
+        Allow WebSocket Ping/Pong messages to be sent between fragments of a
+        fragmented message. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message