Author: markt
Date: Mon Mar 7 12:29:36 2016
New Revision: 1733914
URL: http://svn.apache.org/viewvc?rev=1733914&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59119
Correct read logic
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java?rev=1733914&r1=1733913&r2=1733914&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
Mon Mar 7 12:29:36 2016
@@ -263,8 +263,8 @@ public class AsyncChannelWrapperSecure i
socketReadBuffer.compact();
if (forceRead) {
- Future<Integer> f =
- socketChannel.read(socketReadBuffer);
+ forceRead = false;
+ Future<Integer> f =
socketChannel.read(socketReadBuffer);
Integer socketRead = f.get();
if (socketRead.intValue() == -1) {
throw new EOFException(sm.getString(
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1733914&r1=1733913&r2=1733914&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Mar 7 12:29:36 2016
@@ -207,6 +207,10 @@
Correctly handle compression of partial messages when the final message
fragment has a zero length payload. (markt)
</fix>
+ <fix>
+ <bug>59119</bug>: Correct read logic for WebSocket client when using
+ secure connections. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
