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

474454 - Backport permessage-deflate from Jetty 9.3.x to 9.2.x 

+ post cherry-pick merge cleanup
This commit is contained in:
Joakim Erdfelt 2015-08-06 15:55:24 -07:00
parent c424b58153
commit 5c0906ed6c
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java
View File

@ -133,11 +133,6 @@ public class BrowserDebugTool implements WebSocketCreator
{
LOG.debug("Configuring WebSocketServerFactory ...");
// factory.getExtensionFactory().unregister("deflate-frame");
// factory.getExtensionFactory().unregister("permessage-deflate");
factory.getExtensionFactory().register("permessage-deflate",PerMessageDeflateExtension.class);
// factory.getExtensionFactory().unregister("x-webkit-deflate-frame");
// Registering Frame Debug
factory.getExtensionFactory().register("@frame-debug",FrameDebugExtension.class);

2
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/EchoServlet.java
View File

@ -18,7 +18,6 @@
package org.eclipse.jetty.websocket.server.helper;
import org.eclipse.jetty.websocket.common.extensions.compress.DeflateFrameExtension;
import org.eclipse.jetty.websocket.common.extensions.compress.PerMessageDeflateExtension;
import org.eclipse.jetty.websocket.servlet.WebSocketServlet;
import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
@ -33,7 +32,6 @@ public class EchoServlet extends WebSocketServlet
public void configure(WebSocketServletFactory factory)
{
// Setup some extensions we want to test against
factory.getExtensionFactory().register("x-webkit-deflate-frame",DeflateFrameExtension.class);
factory.getExtensionFactory().register("permessage-compress",PerMessageDeflateExtension.class);
// Setup the desired Socket to use for all incoming upgrade requests