Reverting this to fix the underlying cause.

Revert "KERN-1142 use of the .requestCache directive short-circuits the .expires directive, preventing dev and devwidgets from having Expires headers." This reverts commit a96a4b0.
chakaiproject · Sep 29, 2010 · 9b9edf4 · 9b9edf4
1 parent d1fae41
commit 9b9edf4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/bundles/http/src/main/java/org/sakaiproject/nakamura/http/cache/CacheControlFilter.java b/bundles/http/src/main/java/org/sakaiproject/nakamura/http/cache/CacheControlFilter.java
@@ -64,8 +64,8 @@
 @Properties(value = {
     @Property(name = "service.description", value = "Nakamura Cache-Control Filter"),
     @Property(name = "sakai.cache.paths", value = { 
-        "dev;.lastmodified:unset;.cookies:unset;.expires:3456000;Vary: Accept-Encoding", 
-        "devwidgets;.lastmodified:unset;.cookies:unset;.expires:3456000;Vary: Accept-Encoding",
+        "dev;.lastmodified:unset;.cookies:unset;.requestCache:3600;.expires:3456000;Vary: Accept-Encoding", 
+        "devwidgets;.lastmodified:unset;.cookies:unset;.requestCache:3600;.expires:3456000;Vary: Accept-Encoding",
         "p;Cache-Control:no-cache" }, 
         description = "List of subpaths and max age for all content under subpath in seconds, setting to 0 makes it non cacheing"),
     @Property(name = "sakai.cache.patterns", value = {