From 020a4d6dccfa25235a1481efc3e449a73a0d659a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 24 Oct 2013 08:12:03 -0400
Subject: [PATCH] Merge pull request #119 from simonharrer/fix-locale-test-run-bug
---
src/main/java/com/gitblit/LogoServlet.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/gitblit/LogoServlet.java b/src/main/java/com/gitblit/LogoServlet.java
index c8820ed..eb167e7 100644
--- a/src/main/java/com/gitblit/LogoServlet.java
+++ b/src/main/java/com/gitblit/LogoServlet.java
@@ -29,20 +29,20 @@
/**
* Handles requests for logo.png
- *
+ *
* @author James Moger
- *
+ *
*/
public class LogoServlet extends HttpServlet {
-
+
private static final long serialVersionUID = 1L;
-
+
private static final long lastModified = System.currentTimeMillis();
public LogoServlet() {
super();
}
-
+
@Override
protected long getLastModified(HttpServletRequest req) {
File file = GitBlit.getFileOrFolder(Keys.web.headerLogo, "${baseFolder}/logo.png");
@@ -52,7 +52,7 @@
return lastModified;
}
}
-
+
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
@@ -71,11 +71,12 @@
// default logo
response.setDateHeader("Last-Modified", lastModified);
is = getClass().getResourceAsStream("/logo.png");
- }
+ }
if (contentType == null) {
contentType = "image/png";
}
response.setContentType(contentType);
+ response.setHeader("Cache-Control", "public, max-age=3600, must-revalidate");
OutputStream os = response.getOutputStream();
byte[] buf = new byte[4096];
int bytesRead = is.read(buf);
--
Gitblit v1.9.1