diff options
| -rw-r--r-- | server/src/main/java/com/vaadin/server/communication/HeartbeatHandler.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/server/src/main/java/com/vaadin/server/communication/HeartbeatHandler.java b/server/src/main/java/com/vaadin/server/communication/HeartbeatHandler.java index ed2faad05a..07ab402514 100644 --- a/server/src/main/java/com/vaadin/server/communication/HeartbeatHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/HeartbeatHandler.java @@ -89,7 +89,14 @@ public class HeartbeatHandler extends SynchronizedRequestHandler return false; } - response.sendError(HttpServletResponse.SC_GONE, "Session expired"); + // Ensure that the browser does not cache expired response. + // iOS 6 Safari requires this (#10370) + response.setHeader("Cache-Control", "no-cache"); + // If Content-Type is not set, browsers assume text/html and may + // complain about the empty response body (#12182) + response.setHeader("Content-Type", "text/plain"); + + response.sendError(HttpServletResponse.SC_NOT_FOUND, "Session expired"); return true; } } |