Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug 362740 - Websocket D13 close handling is off [autobahn] 

+ Address autobahn 0.4.3 test case 7.3.1
  Description: Send a close frame with payload length 0 (no close code, no close reason)
  Expectation: Clean close with normal code
This commit is contained in:
Joakim Erdfelt 2011-11-02 16:47:48 -07:00
parent 5f653aa87a
commit cafbb47a2f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD13.java
View File

@ -18,6 +18,7 @@ import java.io.UnsupportedEncodingException;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -30,7 +31,6 @@ import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.io.nio.SelectChannelEndPoint; import org.eclipse.jetty.io.nio.SelectChannelEndPoint;
import org.eclipse.jetty.util.B64Code; import org.eclipse.jetty.util.B64Code;
import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.TypeUtil;
import org.eclipse.jetty.util.Utf8Appendable; import org.eclipse.jetty.util.Utf8Appendable;
import org.eclipse.jetty.util.Utf8StringBuilder; import org.eclipse.jetty.util.Utf8StringBuilder;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
@ -301,7 +301,7 @@ public class WebSocketConnectionD13 extends AbstractConnection implements WebSoc
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public void closeIn(int code,String message) public void closeIn(int code,String message)
{ {
LOG.debug("ClosedIn {} {}",this,message); LOG.debug("ClosedIn {} {} {}",this,code,message);
final boolean close; final boolean close;
final boolean tell_app; final boolean tell_app;
@ -341,7 +341,7 @@ public class WebSocketConnectionD13 extends AbstractConnection implements WebSoc
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public void closeOut(int code,String message) public void closeOut(int code,String message)
{ {
LOG.debug("ClosedOut {} {}",this,message); LOG.debug("ClosedOut {} {} {}",this,code,message);
final boolean close; final boolean close;
final boolean tell_app; final boolean tell_app;
@ -370,8 +370,10 @@ public class WebSocketConnectionD13 extends AbstractConnection implements WebSoc
{ {
if (send_close) if (send_close)
{ {
if (code<=0) if ( (code<=0) || (code == WebSocketConnectionD13.CLOSE_NO_CODE) )
{
code=WebSocketConnectionD13.CLOSE_NORMAL; code=WebSocketConnectionD13.CLOSE_NORMAL;
}
byte[] bytes = ("xx"+(message==null?"":message)).getBytes(StringUtil.__ISO_8859_1); byte[] bytes = ("xx"+(message==null?"":message)).getBytes(StringUtil.__ISO_8859_1);
bytes[0]=(byte)(code/0x100); bytes[0]=(byte)(code/0x100);
bytes[1]=(byte)(code%0x100); bytes[1]=(byte)(code%0x100);