From 47d81db015d2d44d3456444823008d761ff7abda Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 6 Aug 2015 15:08:32 -0700 Subject: [PATCH] 474455 - Enable permessage-deflate WebSocket extension --- .../org/eclipse/jetty/websocket/client/WebSocketClient.java | 5 ----- .../jetty/websocket/server/WebSocketServerFactory.java | 5 ----- .../jetty/websocket/server/browser/BrowserDebugTool.java | 4 ---- 3 files changed, 14 deletions(-) diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java index de4ed1ebe9a..68a2b618835 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java @@ -133,11 +133,6 @@ public class WebSocketClient extends ContainerLifeCycle implements SessionListen this.objectFactory = objectFactory; this.extensionRegistry = new WebSocketExtensionFactory(this); - // Bug #431459 - unregistering compression extensions till they are more stable - this.extensionRegistry.unregister("deflate-frame"); - this.extensionRegistry.unregister("permessage-deflate"); - this.extensionRegistry.unregister("x-webkit-deflate-frame"); - this.masker = new RandomMasker(); this.eventDriverFactory = new EventDriverFactory(policy); diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java index cfa310336a7..d6415a34873 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java @@ -130,11 +130,6 @@ public class WebSocketServerFactory extends ContainerLifeCycle implements WebSoc this.bufferPool = bufferPool; this.extensionFactory = new WebSocketExtensionFactory(this); - // Bug #431459 - unregistering compression extensions till they are more stable - this.extensionFactory.unregister("deflate-frame"); - this.extensionFactory.unregister("permessage-deflate"); - this.extensionFactory.unregister("x-webkit-deflate-frame"); - this.sessionFactories = new ArrayList<>(); this.sessionFactories.add(new WebSocketSessionFactory(this)); this.creator = this; 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 d227269c25c..8fc13aeefe6 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 @@ -28,7 +28,6 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig; import org.eclipse.jetty.websocket.common.extensions.FrameCaptureExtension; -import org.eclipse.jetty.websocket.common.extensions.compress.PerMessageDeflateExtension; import org.eclipse.jetty.websocket.server.WebSocketHandler; import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest; import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse; @@ -133,9 +132,6 @@ public class BrowserDebugTool implements WebSocketCreator { LOG.debug("Configuring WebSocketServerFactory ..."); - // Register permessage-deflate - factory.getExtensionFactory().register("permessage-deflate",PerMessageDeflateExtension.class); - // Registering Frame Debug factory.getExtensionFactory().register("@frame-capture",FrameCaptureExtension.class);