[#569] Fix Cache-Control-header: Don't add 'no-cache' if 'expires' is…

… already present
playframework · Jun 10, 2011 · 3e42011 · 3e42011
1 parent c484ba4
commit 3e42011
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/framework/src/play/server/PlayHandler.java b/framework/src/play/server/PlayHandler.java
@@ -296,7 +296,7 @@ protected static void addToResponse(Response response, HttpResponse nettyRespons
             nettyResponse.addHeader(SET_COOKIE, encoder.encode());
         }
 
-        if (!response.headers.containsKey(CACHE_CONTROL)) {
+        if (!response.headers.containsKey(CACHE_CONTROL) && !response.headers.containsKey(EXPIRES)) {
             nettyResponse.setHeader(CACHE_CONTROL, "no-cache");
         }