You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2011/02/15 21:54:48 UTC

svn commit: r1071052 - /turbine/core/trunk/src/java/org/apache/turbine/util/HttpUtils.java

Author: tv
Date: Tue Feb 15 20:54:47 2011
New Revision: 1071052

URL: http://svn.apache.org/viewvc?rev=1071052&view=rev
Log:
Let the servlet API do the right thing

Modified:
    turbine/core/trunk/src/java/org/apache/turbine/util/HttpUtils.java

Modified: turbine/core/trunk/src/java/org/apache/turbine/util/HttpUtils.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/HttpUtils.java?rev=1071052&r1=1071051&r2=1071052&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/HttpUtils.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/HttpUtils.java Tue Feb 15 20:54:47 2011
@@ -75,14 +75,11 @@ public class HttpUtils
         {
             data.getResponse().setHeader("Pragma", "no-cache");
             data.getResponse().setHeader("Cache-Control", "no-cache");
-            data.getResponse().setHeader("Expires",
-                    formatHttpDate(new Date()));
+            data.getResponse().setDateHeader("Expires", System.currentTimeMillis());
         }
         else
         {
-            Date expiryDate = new Date(System.currentTimeMillis() + expiry);
-            data.getResponse().setHeader("Expires",
-                    formatHttpDate(expiryDate));
+            data.getResponse().setDateHeader("Expires", System.currentTimeMillis() + expiry);
         }
     }
 }