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

Undoing recent change as redundant, existing STRICT block does the same thing

This commit is contained in:
Joakim Erdfelt 2011-11-03 16:03:46 -07:00
parent de4253b5e6
commit 5ca9dbb7d4
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -647,12 +647,13 @@ public class WebSocketConnectionD13 extends AbstractConnection implements WebSoc
if (STRICT) if (STRICT)
{ {
if (isControlFrame(opcode) && buffer.length()>125) if (isControlFrame(opcode) && buffer.length()>MAX_CONTROL_FRAME_PAYLOAD)
{ {
errorClose(WebSocketConnectionD13.CLOSE_PROTOCOL,"Control frame too large"); errorClose(WebSocketConnectionD13.CLOSE_PROTOCOL,"Control frame too large: " + buffer.length() + " > " + MAX_CONTROL_FRAME_PAYLOAD);
return; return;
} }
// TODO: check extensions for RSV bit(s) meanings
if ((flags&0x7)!=0) if ((flags&0x7)!=0)
{ {
errorClose(WebSocketConnectionD13.CLOSE_PROTOCOL,"RSV bits set 0x"+Integer.toHexString(flags)); errorClose(WebSocketConnectionD13.CLOSE_PROTOCOL,"RSV bits set 0x"+Integer.toHexString(flags));
@ -733,11 +734,6 @@ public class WebSocketConnectionD13 extends AbstractConnection implements WebSoc
LOG.debug("PING {}",this); LOG.debug("PING {}",this);
if (!_closedOut) if (!_closedOut)
{ {
if(buffer.length() > MAX_CONTROL_FRAME_PAYLOAD)
{
errorClose(WebSocketConnectionD13.CLOSE_PROTOCOL,"Control frame payload size of " + buffer.length() + " exceeds allowed max size of " + MAX_CONTROL_FRAME_PAYLOAD);
return;
}
_connection.sendControl(WebSocketConnectionD13.OP_PONG,buffer.array(),buffer.getIndex(),buffer.length()); _connection.sendControl(WebSocketConnectionD13.OP_PONG,buffer.array(),buffer.getIndex(),buffer.length());
} }
break; break;
@ -751,12 +747,6 @@ public class WebSocketConnectionD13 extends AbstractConnection implements WebSoc
case WebSocketConnectionD13.OP_CLOSE: case WebSocketConnectionD13.OP_CLOSE:
{ {
if(buffer.length() > MAX_CONTROL_FRAME_PAYLOAD)
{
errorClose(WebSocketConnectionD13.CLOSE_PROTOCOL,"Control frame payload size of " + buffer.length() + " exceeds allowed max size of " + MAX_CONTROL_FRAME_PAYLOAD);
return;
}
int code=WebSocketConnectionD13.CLOSE_NO_CODE; int code=WebSocketConnectionD13.CLOSE_NO_CODE;
String message=null; String message=null;
if (buffer.length()>=2) if (buffer.length()>=2)