You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2007/06/28 20:37:02 UTC

svn commit: r551655 - in /tapestry/tapestry5/trunk/tapestry-core/src: main/java/org/apache/tapestry/internal/services/ResourceStreamerImpl.java test/java/org/apache/tapestry/internal/services/ResourceStreamerImplTest.java

Author: hlship
Date: Thu Jun 28 11:37:01 2007
New Revision: 551655

URL: http://svn.apache.org/viewvc?view=rev&rev=551655
Log:
TAPESTRY-1614: No "expires" header should be set in asset download requests, as that can confuse the browser, preventing changes versions of assets from being downloaded

Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceStreamerImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ResourceStreamerImplTest.java

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceStreamerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceStreamerImpl.java?view=diff&rev=551655&r1=551654&r2=551655
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceStreamerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceStreamerImpl.java Thu Jun 28 11:37:01 2007
@@ -34,10 +34,6 @@
 
     private final int _bufferSize = 1000;
 
-    // One year, in milliseconds
-
-    final static long EXPIRE_DELTA = 31536000000L;
-
     public ResourceStreamerImpl(final Response response, Map<String, String> configuration)
     {
         _response = response;
@@ -60,7 +56,6 @@
         long lastModified = connection.getLastModified();
 
         _response.setDateHeader("Last-Modified", lastModified);
-        _response.setDateHeader("Expires", lastModified + EXPIRE_DELTA);
 
         String contentType = connection.getContentType();
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ResourceStreamerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ResourceStreamerImplTest.java?view=diff&rev=551655&r1=551654&r2=551655
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ResourceStreamerImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ResourceStreamerImplTest.java Thu Jun 28 11:37:01 2007
@@ -61,7 +61,6 @@
 
         train_setContentLength(hsr, anyInt());
         train_setDateHeader(hsr, eq("Last-Modified"), anyLong());
-        train_setDateHeader(hsr, eq("Expires"), anyLong());
         train_setContentType(hsr, contentType);
         train_getOutputStream(hsr, new TestServletOutputStream());