aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-01-13 17:03:27 +0200
committerVaadin Code Review <review@vaadin.com>2015-01-23 12:05:35 +0000
commit84ed6e6d1e13fcd6ab5cdfcd70b5be2dcee84b75 (patch)
tree84e84364548ad8426e468a35b7d323d6ec041a2f
parenteee9375fbb1685ab3c8978ed178fa635470dfaab (diff)
downloadvaadin-framework-84ed6e6d1e13fcd6ab5cdfcd70b5be2dcee84b75.tar.gz
vaadin-framework-84ed6e6d1e13fcd6ab5cdfcd70b5be2dcee84b75.zip
Disable default Atmosphere CORS headers (#16196)
Change-Id: Ic0aafa2bbcb7b0f512405c7b47dd66debd77ed21
-rw-r--r--server/src/com/vaadin/server/communication/PushRequestHandler.java4
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 d0367d0bed..74165a4988 100644
--- a/server/src/com/vaadin/server/communication/PushRequestHandler.java
+++ b/server/src/com/vaadin/server/communication/PushRequestHandler.java
@@ -98,7 +98,9 @@ public class PushRequestHandler implements RequestHandler,
"true");
atmosphere.addInitParameter(ApplicationConfig.MESSAGE_DELIMITER,
String.valueOf(PushConstants.MESSAGE_DELIMITER));
-
+ atmosphere.addInitParameter(
+ ApplicationConfig.DROP_ACCESS_CONTROL_ALLOW_ORIGIN_HEADER,
+ "false");
// Disable heartbeat (it does not emit correct events client side)
// https://github.com/Atmosphere/atmosphere-javascript/issues/141
atmosphere.addInitParameter(