diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-03-04 13:13:23 +0200 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-03-04 13:13:23 +0200 |
| commit | 16d089f7c4a0de5b996b7afaa19a0709aac5001d (patch) | |
| tree | 75415db6b890bf6107820aa903bf827eb6e21437 /client/src | |
| parent | f99e824c198204db1ea385331630b2e5cec49eda (diff) | |
| parent | 06d0cf4daa414eca3c2a73df8171706ca7012213 (diff) | |
| download | vaadin-framework-16d089f7c4a0de5b996b7afaa19a0709aac5001d.tar.gz vaadin-framework-16d089f7c4a0de5b996b7afaa19a0709aac5001d.zip | |
Merge commit '06d0cf4daa414eca3c2a73df8171706ca7012213'
Conflicts:
uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
Change-Id: Ifb458fce1a9a1fa84d935b893f5af1931951058c
Diffstat (limited to 'client/src')
| -rw-r--r-- | client/src/com/vaadin/client/communication/AtmospherePushConnection.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/communication/AtmospherePushConnection.java b/client/src/com/vaadin/client/communication/AtmospherePushConnection.java index 9eb2b881bb..f9ef537830 100644 --- a/client/src/com/vaadin/client/communication/AtmospherePushConnection.java +++ b/client/src/com/vaadin/client/communication/AtmospherePushConnection.java @@ -443,6 +443,7 @@ public class AtmospherePushConnection implements PushConnection { /*-{ return { transport: 'websocket', + maxStreamingLength: 1000000, fallbackTransport: 'streaming', contentType: 'application/json; charset=UTF-8', reconnectInterval: 5000, |