From 084df25cf7c49ada16e73bbf8da9cce99f2fae6c Mon Sep 17 00:00:00 2001 From: Knut Forkalsrud Date: Fri, 13 Apr 2012 11:38:41 -0700 Subject: [PATCH] Stale comment removed --- .../java/org/forkalsrud/album/web/AlbumServlet.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/forkalsrud/album/web/AlbumServlet.java b/src/main/java/org/forkalsrud/album/web/AlbumServlet.java index b54ad5b..cbd8fd1 100644 --- a/src/main/java/org/forkalsrud/album/web/AlbumServlet.java +++ b/src/main/java/org/forkalsrud/album/web/AlbumServlet.java @@ -342,14 +342,20 @@ public class AlbumServlet } void handleMovie(HttpServletRequest req, HttpServletResponse res, FileEntry entry) { + + File file = entry.getPath(); + if (notModified(req, file)) { + res.setStatus(HttpServletResponse.SC_NOT_MODIFIED); + res.setDateHeader("Expires", System.currentTimeMillis() + (30 * 24 * 3600 * 1000L)); // 30 days + log.info(file.getName() + " not modified (based on date)"); + return; + } try { String size = req.getParameter("size"); res.setStatus(HttpServletResponse.SC_OK); - /* res.setDateHeader("Last-Modified", entry.getPath().lastModified()); res.setDateHeader("Expires", System.currentTimeMillis() + (30 * 24 * 3600 * 1000L)); // 30 days - */ - res.setHeader("Cache-control", "no-cache"); + // res.setHeader("Cache-control", "no-cache"); res.setContentType("video/x-flv"); movieCoder.stream(entry.getPath(), entry.getThumbnail(), size, res.getOutputStream()); } catch (Exception ex) {