summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-12-17 17:17:03 +0000
committerVaadin Code Review <review@vaadin.com>2012-12-17 17:17:03 +0000
commit2734e12c3d214a82240394e75dbba26c24d2c0f1 (patch)
tree393e09ac47db1833faf74cbf0f899b9fe62dc33c /server/src/com/vaadin
parent308fd10fe8148ebfca63f7a553e6ae018ad9af0c (diff)
parentde976e30c711fcfc986f4cc516342797c5667be7 (diff)
downloadvaadin-framework-2734e12c3d214a82240394e75dbba26c24d2c0f1.tar.gz
vaadin-framework-2734e12c3d214a82240394e75dbba26c24d2c0f1.zip
Merge "Merge of (#9732) to Vaadin 7."
Diffstat (limited to 'server/src/com/vaadin')
-rw-r--r--server/src/com/vaadin/server/VaadinPortlet.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/server/src/com/vaadin/server/VaadinPortlet.java b/server/src/com/vaadin/server/VaadinPortlet.java
index 507f563289..94555fe2ff 100644
--- a/server/src/com/vaadin/server/VaadinPortlet.java
+++ b/server/src/com/vaadin/server/VaadinPortlet.java
@@ -479,6 +479,11 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
// Handles AJAX UIDL requests
communicationManager.handleUidlRequest(vaadinRequest,
vaadinResponse, portletWrapper, uI);
+
+ // Ensure that the browser does not cache UIDL
+ // responses.
+ // iOS 6 Safari requires this (#9732)
+ response.setProperty("Cache-Control", "no-cache");
return;
} else {
handleOtherRequest(vaadinRequest, vaadinResponse,