Fix fallback from websocket when behind proxy (#13299)

Change-Id: Id12cb97816afde4363caea20ff30376ff9cdb173

diff --git a/push/build.xml b/push/build.xml
index abeec2a8b0b60e64f280490c2aa2efd689744cdd..d2379d6090ddea42eb6df6cf82cb76a6294cada9 100644 (file)
--- a/push/build.xml
+++ b/push/build.xml
@@ -16,7 +16,7 @@
     <property name="vaadinPush.debug.js" location="${result.dir}/js/VAADIN/vaadinPush.debug.js" />
 
     <!-- Keep the version number in sync with ivy.xml, server/src/com/vaadin/server/Constants.java -->
-    <property name="atmosphere.runtime.version" value="1.0.18.vaadin1" />
+    <property name="atmosphere.runtime.version" value="1.0.18.vaadin2" />
     <property name="jquery.version" value="1.9.0" />
 
     <path id="classpath.compile.custom" />

diff --git a/push/ivy.xml b/push/ivy.xml
index 2be47512feeb2eaaf4038f4c6ebc3731ca4e3d5d..f4e3d94ecec59f7d23a71c05da2b928c041aef16 100644 (file)
--- a/push/ivy.xml
+++ b/push/ivy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE ivy-module [
 <!-- Keep the version number in sync with build.xml -->
-    <!ENTITY atmosphere.runtime.version "1.0.18.vaadin1">
+    <!ENTITY atmosphere.runtime.version "1.0.18.vaadin2">
     
     <!ENTITY atmosphere.js.version "2.0.3.vaadin2">
 ]>

diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java
index b0841da314852adbd1a67e446de765859e5a3dad..2f6f39eeff73f1635129dfb396186b809703a45d 100644 (file)
--- a/server/src/com/vaadin/server/Constants.java
+++ b/server/src/com/vaadin/server/Constants.java
@@ -67,7 +67,7 @@ public interface Constants {
 
     // Keep the version number in sync with push/build.xml and other locations
     // listed in that file
-    static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "1.0.18.vaadin1";
+    static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "1.0.18.vaadin2";
 
     static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
             + "=================================================================\n"