Author: markt
Date: Tue Sep 4 20:05:03 2012
New Revision: 1380841
URL: http://svn.apache.org/viewvc?rev=1380841&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53828
Use the correct status code
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:r1380838
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=1380841&r1=1380840&r2=1380841&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
Tue Sep 4 20:05:03 2012
@@ -202,7 +202,7 @@ public abstract class StreamInbound impl
try {
getWsOutbound().close(frame);
} finally {
- doOnClose(Constants.OPCODE_CLOSE);
+ doOnClose(Constants.STATUS_CLOSE_NORMAL);
}
}
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=1380841&r1=1380840&r2=1380841&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Sep 4 20:05:03 2012
@@ -60,6 +60,10 @@
Add one library from JDK 7 to the value of <code>jarsToSkip</code>
property in the <code>catalina.properties</code> file. (kkolinko)
</update>
+ <fix>
+ <bug>53828</bug>: Use correct status code when closing a WebSocket
+ connection normally in response to a close frame from a client. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
