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 2016/06/06 16:28:21 UTC
svn commit: r1747035 - in /tomcat/trunk:
java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
webapps/docs/changelog.xml
Author: markt
Date: Mon Jun 6 16:28:21 2016
New Revision: 1747035
URL: http://svn.apache.org/viewvc?rev=1747035&view=rev
Log:
Fix possible memory leak in WebSocket handling of unexpected client disconnects.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java?rev=1747035&r1=1747034&r2=1747035&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java Mon Jun 6 16:28:21 2016
@@ -153,6 +153,7 @@ public class WsHttpUpgradeHandler implem
CloseReason cr = new CloseReason(
CloseCodes.CLOSED_ABNORMALLY, ioe.getMessage());
close(cr);
+ return SocketState.CLOSED;
}
break;
case OPEN_WRITE:
@@ -168,6 +169,7 @@ public class WsHttpUpgradeHandler implem
cr = new CloseReason(
CloseCodes.CLOSED_ABNORMALLY, ioe.getMessage());
close(cr);
+ return SocketState.CLOSED;
}
break;
case ERROR:
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1747035&r1=1747034&r2=1747035&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jun 6 16:28:21 2016
@@ -142,6 +142,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="WebSocket">
+ <changelog>
+ <fix>
+ <bug>59659</bug>: Fix possible memory leak in WebSocket handling of
+ unexpected client disconnects. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Web applications">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org