Merge remote-tracking branch 'origin/master' into grid

Change-Id: I8f1f412eeb450688bba58b715eba6db9e4ae43ae

3 files changed, 35 insertions, 2 deletions

diff --git a/shared/src/com/vaadin/shared/communication/PushConstants.java b/shared/src/com/vaadin/shared/communication/PushConstants.java
index f16cbb7390..4b4f247e5f 100644
--- a/shared/src/com/vaadin/shared/communication/PushConstants.java
+++ b/shared/src/com/vaadin/shared/communication/PushConstants.java
@@ -27,8 +27,11 @@ public class PushConstants implements Serializable {
 
     /**
      * The size, in <b>bytes</b>, of the receiving buffer used by some servers.
+     * <p>
+     * Should not be set to a value equal to or greater than 32768 due to a
+     * Jetty 9.1 issue (see #13087)
      */
-    public static final int WEBSOCKET_BUFFER_SIZE = 65536;
+    public static final int WEBSOCKET_BUFFER_SIZE = 16384;
 
     /**
      * The maximum size, in <b>characters</b>, of a websocket message fragment.
diff --git a/shared/src/com/vaadin/shared/ui/ui/Transport.java b/shared/src/com/vaadin/shared/ui/ui/Transport.java
index ea641c0a3c..ebc0ba3aea 100644
--- a/shared/src/com/vaadin/shared/ui/ui/Transport.java
+++ b/shared/src/com/vaadin/shared/ui/ui/Transport.java
@@ -30,7 +30,11 @@ public enum Transport {
     /**
      * HTTP streaming
      */
-    STREAMING("streaming");
+    STREAMING("streaming"),
+    /**
+     * HTTP long polling
+     */
+    LONG_POLLING("long-polling");
 
     private String identifier;
 
diff --git a/shared/src/com/vaadin/shared/ui/upload/UploadClientRpc.java b/shared/src/com/vaadin/shared/ui/upload/UploadClientRpc.java
new file mode 100644
index 0000000000..1757ddb001
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/upload/UploadClientRpc.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2013 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.shared.ui.upload;
+
+import com.vaadin.shared.communication.ClientRpc;
+
+public interface UploadClientRpc extends ClientRpc {
+
+    /**
+     * Forces the upload the send selected file to the server.
+     */
+    void submitUpload();
+}