From 61555b59c56aa913b669e26daab963a57349423c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 26 Jun 2013 17:43:37 -0400
Subject: [PATCH] Fixed last modified caching for logo servlet
---
src/main/java/com/gitblit/LogoServlet.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/LogoServlet.java b/src/main/java/com/gitblit/LogoServlet.java
index 7402fc1..166bf40 100644
--- a/src/main/java/com/gitblit/LogoServlet.java
+++ b/src/main/java/com/gitblit/LogoServlet.java
@@ -47,7 +47,7 @@
protected long getLastModified(HttpServletRequest req) {
File file = GitBlit.getFileOrFolder(Keys.web.headerLogo, "${baseFolder}/logo.png");
if (file.exists()) {
- return file.lastModified();
+ return Math.max(lastModified, file.lastModified());
} else {
return lastModified;
}
@@ -65,7 +65,7 @@
ServletContext context = request.getSession().getServletContext();
contentType = context.getMimeType(file.getName());
response.setContentLength((int) file.length());
- response.setDateHeader("Last-Modified", file.lastModified());
+ response.setDateHeader("Last-Modified", Math.max(lastModified, file.lastModified()));
is = new FileInputStream(file);
} else {
// default logo
--
Gitblit v1.9.1