summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonatan Kronqvist <jonatan@vaadin.com>2012-11-27 13:47:10 +0200
committerJonatan Kronqvist <jonatan@vaadin.com>2012-11-29 14:32:02 +0200
commit95ed623fc702fd2cfdd78224476569554c44230b (patch)
tree3e41501bd418f01feb30cf596aefbb49d7e11b12
parent393a5faf1e0e21212ee0f9fed756244d7c3dc807 (diff)
downloadvaadin-framework-95ed623fc702fd2cfdd78224476569554c44230b.tar.gz
vaadin-framework-95ed623fc702fd2cfdd78224476569554c44230b.zip
Use max-age 0 for *nocache* instead of the default 1h #10421
Change-Id: Id04fd8cee919a1d31fc2952e5bbf064075dbf9ce
-rw-r--r--server/src/com/vaadin/server/VaadinServlet.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/server/src/com/vaadin/server/VaadinServlet.java b/server/src/com/vaadin/server/VaadinServlet.java
index a285c327eb..0ad4dea37d 100644
--- a/server/src/com/vaadin/server/VaadinServlet.java
+++ b/server/src/com/vaadin/server/VaadinServlet.java
@@ -870,8 +870,12 @@ public class VaadinServlet extends HttpServlet implements Constants {
*/
int resourceCacheTime = getService().getDeploymentConfiguration()
.getResourceCacheTime();
- response.setHeader("Cache-Control",
- "max-age= " + String.valueOf(resourceCacheTime));
+ String cacheControl = "max-age="
+ + String.valueOf(resourceCacheTime);
+ if (filename.contains("nocache")) {
+ cacheControl = "public, max-age=0, must-revalidate";
+ }
+ response.setHeader("Cache-Control", cacheControl);
}
// Write the resource to the client.