Title: [775] trunk/rails-integration/src/main/java/org/jruby/webapp/FileServlet.
java: #14981 - Let FileServlet always add a LastModified header,
patch supplied by Jens Kramer
- Revision
- 775
- Author
- tantalon
- Date
- 2007-10-23 17:13:58 -0400 (Tue, 23 Oct 2007)
Log Message
#14981 - Let FileServlet always add a LastModified header, patch supplied by Jens Kramer
Modified Paths
Diff
Modified: trunk/rails-integration/src/main/java/org/jruby/webapp/FileServlet.java (774 => 775)
--- trunk/rails-integration/src/main/java/org/jruby/webapp/FileServlet.java 2007-10-22 13:06:37 UTC (rev 774)
+++ trunk/rails-integration/src/main/java/org/jruby/webapp/FileServlet.java 2007-10-23 21:13:58 UTC (rev 775)
@@ -215,14 +215,11 @@
// check for modifications
long ifModifiedSince = request.getDateHeader("If-Modified-Since");
- if (ifModifiedSince != -1) {
- long lastModified = fileLocation.lastModified();
- if (lastModified == 0) {
- // last modified date is not known
- } else if (lastModified < ifModifiedSince) {
+ long lastModified = fileLocation.lastModified();
+ if (lastModified > 0) {
+ response.setDateHeader("Last-Modified", lastModified);
+ if (ifModifiedSince != -1 && lastModified <= ifModifiedSince) {
throw new NotModifiedException();
- } else {
- response.setDateHeader("Last-Modified", lastModified);
}
}
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel
