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

Make sure the date computations don't overflow the integer range.

Browse source
This commit is contained in:
Knut Forkalsrud 2010-05-20 11:32:24 -07:00
parent 22b810c991
commit bd8abd9053
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -238,14 +238,14 @@ public class AlbumServlet
if (notModified(req, file)) { if (notModified(req, file)) {
res.setStatus(HttpServletResponse.SC_NOT_MODIFIED); res.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
res.setDateHeader("Expires", System.currentTimeMillis() + (30 * 24 * 3600 * 1000)); // 30 days res.setDateHeader("Expires", System.currentTimeMillis() + (30 * 24 * 3600 * 1000L)); // 30 days
System.out.println(file.getName() + " not modified (based on date)"); System.out.println(file.getName() + " not modified (based on date)");
return; return;
} }
String fileEtag = thumbnail.getEtag() + "-" + size; String fileEtag = thumbnail.getEtag() + "-" + size;
if (etagMatches(req, fileEtag)) { if (etagMatches(req, fileEtag)) {
res.setStatus(HttpServletResponse.SC_NOT_MODIFIED); res.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
res.setDateHeader("Expires", System.currentTimeMillis() + (30 * 24 * 3600 * 1000)); // 30 days res.setDateHeader("Expires", System.currentTimeMillis() + (30 * 24 * 3600 * 1000L)); // 30 days
System.out.println(file.getName() + " not modified (based on etag)"); System.out.println(file.getName() + " not modified (based on etag)");
return; return;
} }
@ -269,7 +269,7 @@ public class AlbumServlet
res.setStatus(HttpServletResponse.SC_OK); res.setStatus(HttpServletResponse.SC_OK);
res.setDateHeader("Last-Modified", file.lastModified()); res.setDateHeader("Last-Modified", file.lastModified());
res.setHeader("ETag", fileEtag); res.setHeader("ETag", fileEtag);
res.setDateHeader("Expires", System.currentTimeMillis() + (30 * 24 * 3600 * 1000)); // 30 days res.setDateHeader("Expires", System.currentTimeMillis() + (30 * 24 * 3600 * 1000L)); // 30 days
res.setContentType(cimg.mimeType); res.setContentType(cimg.mimeType);
res.setContentLength(cimg.bits.length); res.setContentLength(cimg.bits.length);
res.getOutputStream().write(cimg.bits); res.getOutputStream().write(cimg.bits);