Author: markt
Date: Mon Jan 7 12:59:23 2013
New Revision: 1429785
URL: http://svn.apache.org/viewvc?rev=1429785&view=rev
Log:
Make non-JSR356 WebSocket implementation non-blocking between HTTP upgrade and
first message.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1429784
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java?rev=1429785&r1=1429784&r2=1429785&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java
Mon Jan 7 12:59:23 2013
@@ -114,7 +114,7 @@ public abstract class StreamInbound impl
WsInputStream wsIs = new WsInputStream(processor, getWsOutbound());
try {
- WsFrame frame = wsIs.nextFrame(true);
+ WsFrame frame = wsIs.nextFrame(false);
while (frame != null) {
// TODO User defined extensions may define values for rsv
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=1429785&r1=1429784&r2=1429785&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jan 7 12:59:23 2013
@@ -87,6 +87,11 @@
Cleanup method cache lookup code in <code>SecurityUtil</code> class.
(kkolinko)
</scode>
+ <add>
+ Make the Tomcat 7 non-JSR356 WebSocket implementation non-blocking
+ (where supported by the connector) between the HTTP upgrade and the
+ first WebSocket message from the client to the server. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
