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

344059 added x-extensions 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3054 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2011-05-02 09:30:21 +00:00
parent 88bfdd6631
commit 9f6e934c4f
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/DeflateFrameExtension.java
View File

@ -19,7 +19,7 @@ public class DeflateFrameExtension extends AbstractExtension
public DeflateFrameExtension()
{
super("deflate-frame",0,0,1);
super("x-deflate-frame",0,0,1);
}
@Override

2
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java
View File

@ -262,7 +262,7 @@ public class WebSocketFactory
if ("fragment".equals(name))
return new FragmentExtension();
if ("deflate-frame".equals(name))
if ("x-deflate-frame".equals(name))
return new DeflateFrameExtension();
return null;

2
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadD07Test.java
View File

@ -202,7 +202,7 @@ public class WebSocketLoadD07Test
for (int i = 0; i < iterations; ++i)
{
byte[] data = message.getBytes(StringUtil.__UTF8);
_generator.addFrame((byte)0x8,WebSocketConnectionD06.OP_TEXT,data,0,data.length);
_generator.addFrame((byte)0x8,WebSocketConnectionD07.OP_TEXT,data,0,data.length);
_generator.flush();
//System.err.println("-> "+message);

4
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD07Test.java
View File

@ -272,7 +272,7 @@ public class WebSocketMessageD07Test
"Sec-WebSocket-Origin: http://example.com\r\n"+
"Sec-WebSocket-Protocol: echo\r\n" +
"Sec-WebSocket-Version: 7\r\n"+
"Sec-WebSocket-Extensions: deflate-frame\r\n"+
"Sec-WebSocket-Extensions: x-deflate-frame\r\n"+
"Sec-WebSocket-Extensions: fragment;fragments=2\r\n"+
"\r\n").getBytes("ISO-8859-1"));
output.flush();
@ -285,7 +285,7 @@ public class WebSocketMessageD07Test
skipTo("Sec-WebSocket-Accept: ",input);
lookFor("s3pPLMBiTxaQ9kYGzzhZRbK+xOo=",input);
skipTo("Sec-WebSocket-Extensions: ",input);
lookFor("deflate-frame;minLength=64",input);
lookFor("x-deflate-frame;minLength=64",input);
skipTo("Sec-WebSocket-Extensions: ",input);
lookFor("fragment;",input);
skipTo("\r\n\r\n",input);