Skip to content

Commit

Permalink
Workaround Jetty 9 issue with Chrome https://bugs.eclipse.org/bugs/sh…
Browse files Browse the repository at this point in the history
  • Loading branch information
jfarcand committed Sep 24, 2012
1 parent 4f35b81 commit 2d10aa0
Showing 1 changed file with 13 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,28 @@
import org.atmosphere.cpr.AtmosphereResponse;
import org.atmosphere.util.Utils;
import org.atmosphere.websocket.WebSocket;
import org.eclipse.jetty.websocket.core.api.Extension;
import org.eclipse.jetty.websocket.core.api.UpgradeRequest;
import org.eclipse.jetty.websocket.core.api.UpgradeResponse;
import org.eclipse.jetty.websocket.core.api.WebSocketBehavior;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.server.ServletWebSocketRequest;
import org.eclipse.jetty.websocket.server.WebSocketCreator;
import org.eclipse.jetty.websocket.server.WebSocketServerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.servlet.ServletException;
import java.io.IOException;
import java.util.List;

import static org.atmosphere.cpr.HeaderConfig.X_ATMOSPHERE_ERROR;

/**
* Jetty 9 WebSocket support.
*
* @author Jeanfrancois Arcand
*/
public class Jetty9AsyncSupportWithWebSocket extends Jetty7CometSupport {
private static final Logger logger = LoggerFactory.getLogger(Jetty9AsyncSupportWithWebSocket.class);
private final WebSocketServerFactory webSocketFactory;
Expand Down Expand Up @@ -69,6 +77,11 @@ public Jetty9AsyncSupportWithWebSocket(final AtmosphereConfig config) {

@Override
public Object createWebSocket(UpgradeRequest upgradeRequest, UpgradeResponse upgradeResponse) {
// Workaround https://bugs.eclipse.org/bugs/show_bug.cgi?id=390263
// TODO: Remove me.
ServletWebSocketRequest r = ServletWebSocketRequest.class.cast(upgradeRequest);
r.getExtensions().clear();

return new Jetty9WebSocketHandler(upgradeRequest, config.framework(), config.framework().getWebSocketProtocol());
}
});
Expand Down

0 comments on commit 2d10aa0

Please sign in to comment.