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

421189 - WebSocket / AbstractExtension's WebSocketPolicy is not Session-specific 

+ Ensuring that the EventDriver managed policy is used by the
  ExtensionStack
This commit is contained in:
Joakim Erdfelt 2013-12-12 13:51:01 -07:00
parent bc7afdc172
commit ecf3b8a68f
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/ExtensionStack.java
View File

@ -28,6 +28,7 @@ import org.eclipse.jetty.util.annotation.ManagedObject;
import org.eclipse.jetty.util.component.ContainerLifeCycle;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.api.WriteCallback;
import org.eclipse.jetty.websocket.api.extensions.Extension;
import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
@ -245,6 +246,17 @@ public class ExtensionStack extends ContainerLifeCycle implements IncomingFrames
this.nextOutgoing = nextOutgoing;
}
public void setPolicy(WebSocketPolicy policy)
{
for (Extension extension : extensions)
{
if (extension instanceof AbstractExtension)
{
((AbstractExtension)extension).setPolicy(policy);
}
}
}
@Override
public String toString()
{
@ -283,4 +295,3 @@ public class ExtensionStack extends ContainerLifeCycle implements IncomingFrames
return s.toString();
}
}

1
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
View File

@ -533,6 +533,7 @@ public class WebSocketServerFactory extends ContainerLifeCycle implements WebSoc
WebSocketServerConnection wsConnection = new WebSocketServerConnection(endp,executor,scheduler,driver.getPolicy(),bufferPool,this);
connection = wsConnection;
extensionStack.setPolicy(driver.getPolicy());
extensionStack.configure(wsConnection.getParser());
extensionStack.configure(wsConnection.getGenerator());

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

@ -38,5 +38,9 @@ public class EchoServlet extends WebSocketServlet
// Setup the desired Socket to use for all incoming upgrade requests
factory.register(EchoSocket.class);
// Some alternate sizes
factory.getPolicy().setMaxBinaryMessageSize(2222);
factory.getPolicy().setMaxTextMessageSize(4444);
}
}