Merge of (#9732) to Vaadin 7.

Ensure that the browser does not cache UIDL responses (iOS 6 Safari
fix).

Change-Id: I432cf2bf202e3f37b479e3950a6a39ca067497b4

diff --git a/server/src/com/vaadin/server/VaadinPortlet.java b/server/src/com/vaadin/server/VaadinPortlet.java
index 507f563289881d414b66cdf7bf5e8572bc100126..94555fe2ffc60dd92c2ec8bf2b65eb73765ed911 100644 (file)
--- 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,