From f66e89662c091e082bd1d2feb6ac91513ccff273 Mon Sep 17 00:00:00 2001
From: Rafael Cavazin <rafaelcavazin@gmail.com>
Date: Sun, 21 Jul 2013 09:59:00 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/gitblit/gitblit
---
src/main/java/com/gitblit/LogoServlet.java | 96 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 96 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/gitblit/LogoServlet.java b/src/main/java/com/gitblit/LogoServlet.java
new file mode 100644
index 0000000..823e464
--- /dev/null
+++ b/src/main/java/com/gitblit/LogoServlet.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2013 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gitblit;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 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");
+ if (file.exists()) {
+ return Math.max(lastModified, file.lastModified());
+ } else {
+ return lastModified;
+ }
+ }
+
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ InputStream is = null;
+ try {
+ String contentType = null;
+ File file = GitBlit.getFileOrFolder(Keys.web.headerLogo, "${baseFolder}/logo.png");
+ if (file.exists()) {
+ // custom logo
+ ServletContext context = request.getSession().getServletContext();
+ contentType = context.getMimeType(file.getName());
+ response.setContentLength((int) file.length());
+ response.setDateHeader("Last-Modified", Math.max(lastModified, file.lastModified()));
+ is = new FileInputStream(file);
+ } else {
+ // 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);
+ while (bytesRead != -1) {
+ os.write(buf, 0, bytesRead);
+ bytesRead = is.read(buf);
+ }
+ os.flush();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ if(is != null) {
+ is.close();
+ }
+ }
+ }
+}
--
Gitblit v1.9.1