summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-09-03 18:23:27 +0000
committerVaadin Code Review <review@vaadin.com>2015-10-09 10:54:08 +0000
commit25ab60c193575c9b0a0698d34eba4d406c3223f9 (patch)
tree9398f87783de1b24f0cd84f0c1c35d89ebfdecc2 /server
parentb73e0d8885ae015b2dcc749065063c006f3bb5cc (diff)
downloadvaadin-framework-25ab60c193575c9b0a0698d34eba4d406c3223f9.tar.gz
vaadin-framework-25ab60c193575c9b0a0698d34eba4d406c3223f9.zip
Revert "connection: close" change for long polling (#18758)
This reverts commit 79c8c696c09b0a7cbe1f1863e6c7c165b2f5f19f Change-Id: I364bc4a77cff36f319cec86a793806a0406f78b4
Diffstat (limited to 'server')
-rw-r--r--server/src/com/vaadin/server/communication/PushHandler.java12
1 files changed, 3 insertions, 9 deletions
diff --git a/server/src/com/vaadin/server/communication/PushHandler.java b/server/src/com/vaadin/server/communication/PushHandler.java
index 483c0abc44..0b4fe28b77 100644
--- a/server/src/com/vaadin/server/communication/PushHandler.java
+++ b/server/src/com/vaadin/server/communication/PushHandler.java
@@ -81,18 +81,12 @@ public class PushHandler {
resource.getResponse().setContentType("text/plain; charset=UTF-8");
VaadinSession session = ui.getSession();
- if (resource.transport() == TRANSPORT.STREAMING
- || resource.transport() == TRANSPORT.LONG_POLLING) {
- // Must ensure that the streaming/long-polling response contains
+ if (resource.transport() == TRANSPORT.STREAMING) {
+ // Must ensure that the streaming response contains
// "Connection: close", otherwise iOS 6 will wait for the
// response to this request before sending another request to
// the same server (as it will apparently try to reuse the same
- // connection).
-
- // Other browsers might also try to re-use the same
- // connection for fetching static files after refreshing, which
- // will cause a failure in loading vaadinPush.js or
- // vaadinBootstrap.js
+ // connection)
resource.getResponse().addHeader("Connection", "close");
}