knut/album
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stale comment removed

Browse source
This commit is contained in:
Knut Forkalsrud 2012-04-13 11:38:41 -07:00
parent 7eba71ca9a
commit 084df25cf7
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/org/forkalsrud/album/web/AlbumServlet.java
View file

@ -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) {