You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by et...@apache.org on 2008/10/18 02:24:10 UTC
svn commit: r705827 - in /incubator/shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/servlet/HttpUtil.java
test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java
Author: etnu
Date: Fri Oct 17 17:24:10 2008
New Revision: 705827
URL: http://svn.apache.org/viewvc?rev=705827&view=rev
Log:
Removed Last-Modified header, as the condition it was intended to resolve is only applicable to FF 1.5 and earlier and actually causes issues on newer browsers (resulting in more 304s, and thus requests).
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpUtil.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpUtil.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpUtil.java?rev=705827&r1=705826&r2=705827&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpUtil.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpUtil.java Fri Oct 17 17:24:10 2008
@@ -35,19 +35,17 @@
public class HttpUtil {
// 1 year.
public static final int DEFAULT_TTL = 60 * 60 * 24 * 365;
-
+
private static TimeSource timeSource;
- private static long startTime;
-
+
static {
setTimeSource(new TimeSource());
}
public static void setTimeSource(TimeSource timeSource) {
HttpUtil.timeSource = timeSource;
- startTime = HttpUtil.timeSource.currentTimeMillis();
}
-
+
/**
* Sets HTTP headers that instruct the browser to cache content. Implementations should take care
* to use cache-busting techniques on the url if caching for a long period of time.
@@ -102,8 +100,6 @@
} else {
response.setHeader("Cache-Control", "public,max-age=" + Integer.toString(ttl));
}
- // Firefox requires this for certain cases.
- response.setDateHeader("Last-Modified", startTime);
}
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java?rev=705827&r1=705826&r2=705827&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java Fri Oct 17 17:24:10 2008
@@ -74,10 +74,6 @@
} else {
assertTrue("No public Cache-Control directive was set.", directives.contains("public"));
}
-
- long lastModified = DateUtil.parseDate(recorder.getHeader("Last-Modified")).getTime();
-
- assertGreater("Invalid Last-Modified header set.", 0L, lastModified);
}
}
}