Merge branch 'ticket/148' into develop

James Moger

2014-09-04 8d9750ef65660ca2488fc8ff65ba9c1040143c71

 src/main/java/com/gitblit/servlet/PagesServlet.java

@@ -15,14 +15,23 @@
 */

package com.gitblit.servlet;



import com.google.inject.Inject;

import com.google.inject.Singleton;

import java.io.IOException;
import java.io.InputStream;
import java.util.Date;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;


import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;


import com.gitblit.Constants;

import com.gitblit.manager.IRepositoryManager;

import com.gitblit.manager.IRuntimeManager;

import com.gitblit.utils.JGitUtils;
import com.google.inject.Inject;
import com.google.inject.Singleton;


/**

 * Serves the content of a gh-pages branch.

@@ -86,4 +95,22 @@
   protected void setContentType(HttpServletResponse response, String contentType) {

      response.setContentType(contentType);;

   }


   @Override
   protected void streamFromRepo(HttpServletResponse response, Repository repository,
         RevCommit commit, String requestedPath) throws IOException {

      response.setDateHeader("Last-Modified", JGitUtils.getCommitDate(commit).getTime());
      response.setHeader("Cache-Control", "public, max-age=3600, must-revalidate");

      super.streamFromRepo(response, repository, commit, requestedPath);
   }

   @Override
   protected void sendContent(HttpServletResponse response, Date date, InputStream is) throws ServletException, IOException {
      response.setDateHeader("Last-Modified", date.getTime());
      response.setHeader("Cache-Control", "public, max-age=3600, must-revalidate");

      super.sendContent(response, date, is);
   }
}