diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-11-27 07:43:23 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-11-27 07:43:23 +0000 |
| commit | 68ce534db7bf2aae75f9a6bf2ccdf3bea9fd69e4 (patch) | |
| tree | e05e8f9079a0976c2737e0e530ac5ac308b32aa9 /server/src/com/vaadin | |
| parent | 190500e1bb72dbaa0a8cf2de9599a99d5cc63181 (diff) | |
| parent | 3149ad73bdabc994f789ecb13c346bc77bc735f7 (diff) | |
| download | vaadin-framework-68ce534db7bf2aae75f9a6bf2ccdf3bea9fd69e4.tar.gz vaadin-framework-68ce534db7bf2aae75f9a6bf2ccdf3bea9fd69e4.zip | |
Merge "Ensure iOS6 does not cache heartbeat responses (#10370)"
Diffstat (limited to 'server/src/com/vaadin')
| -rw-r--r-- | server/src/com/vaadin/server/AbstractCommunicationManager.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/server/src/com/vaadin/server/AbstractCommunicationManager.java b/server/src/com/vaadin/server/AbstractCommunicationManager.java index 0832a1a33a..19b0ac2aee 100644 --- a/server/src/com/vaadin/server/AbstractCommunicationManager.java +++ b/server/src/com/vaadin/server/AbstractCommunicationManager.java @@ -2733,6 +2733,9 @@ public abstract class AbstractCommunicationManager implements Serializable { } if (ui != null) { ui.setLastHeartbeatTimestamp(System.currentTimeMillis()); + // Ensure that the browser does not cache heartbeat responses. + // iOS 6 Safari requires this (#10370) + response.setHeader("Cache-Control", "no-cache"); } else { response.sendError(HttpServletResponse.SC_NOT_FOUND, "UI not found"); } |