diff options
| author | Artur Signell <artur@vaadin.com> | 2015-01-13 17:03:27 +0200 |
|---|---|---|
| committer | Sauli Tähkäpää <sauli@vaadin.com> | 2015-02-02 11:55:22 +0200 |
| commit | 691b973ff78f933392ad72d4842a0d4d8cb4480a (patch) | |
| tree | 0b309c2f2d3394e28acb5a2893a2c2d927529fb6 | |
| parent | c76723db8dcbc15e6819b7b02c49c7293240fee4 (diff) | |
| download | vaadin-framework-691b973ff78f933392ad72d4842a0d4d8cb4480a.tar.gz vaadin-framework-691b973ff78f933392ad72d4842a0d4d8cb4480a.zip | |
Disable default Atmosphere CORS headers (#16196)
Change-Id: Ic0aafa2bbcb7b0f512405c7b47dd66debd77ed21
Conflicts:
server/src/com/vaadin/server/communication/PushRequestHandler.java
| -rw-r--r-- | server/src/com/vaadin/server/communication/PushRequestHandler.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/server/src/com/vaadin/server/communication/PushRequestHandler.java b/server/src/com/vaadin/server/communication/PushRequestHandler.java index 308f94686f..7fae813aa5 100644 --- a/server/src/com/vaadin/server/communication/PushRequestHandler.java +++ b/server/src/com/vaadin/server/communication/PushRequestHandler.java @@ -101,7 +101,9 @@ public class PushRequestHandler implements RequestHandler, ApplicationConfig.PROPERTY_SESSION_SUPPORT, "true"); atmosphere.addInitParameter(ApplicationConfig.MESSAGE_DELIMITER, String.valueOf(PushConstants.MESSAGE_DELIMITER)); - + atmosphere.addInitParameter( + ApplicationConfig.DROP_ACCESS_CONTROL_ALLOW_ORIGIN_HEADER, + "false"); final String bufferSize = String .valueOf(PushConstants.WEBSOCKET_BUFFER_SIZE); atmosphere.addInitParameter( |