summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server/src/com/vaadin/server/communication/HeartbeatHandler.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/server/src/com/vaadin/server/communication/HeartbeatHandler.java b/server/src/com/vaadin/server/communication/HeartbeatHandler.java
index 16c21224ab..4c95859203 100644
--- a/server/src/com/vaadin/server/communication/HeartbeatHandler.java
+++ b/server/src/com/vaadin/server/communication/HeartbeatHandler.java
@@ -63,6 +63,9 @@ public class HeartbeatHandler extends SynchronizedRequestHandler implements
// Ensure that the browser does not cache heartbeat responses.
// 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");
} else {
response.sendError(HttpServletResponse.SC_NOT_FOUND, "UI not found");
}