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

+ post cherry-pick merge cleanup

2 files changed, 0 insertions, 7 deletions

diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java
index 257a1e1935..178e5652a4 100644
--- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java
+++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java
@@ -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);
 
diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/EchoServlet.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/EchoServlet.java
index f78242312b..3da0095269 100644
--- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/EchoServlet.java
+++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/EchoServlet.java
@@ -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