From 21fe98ebf8687f68cffbe6b6b8dec0073e93c541 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 04 Sep 2014 14:59:32 -0400
Subject: [PATCH] Merge branch 'ticket/152' into develop
---
src/main/java/com/gitblit/servlet/RawServlet.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/gitblit/servlet/RawServlet.java b/src/main/java/com/gitblit/servlet/RawServlet.java
index 8024108..0ae9155 100644
--- a/src/main/java/com/gitblit/servlet/RawServlet.java
+++ b/src/main/java/com/gitblit/servlet/RawServlet.java
@@ -110,10 +110,6 @@
String encodedPath = path == null ? "" : path.replace(' ', '-');
encodedPath = encodedPath.replace('/', fsc);
- try {
- encodedPath = URLEncoder.encode(encodedPath, "UTF-8");
- } catch (UnsupportedEncodingException e) {
- }
return baseURL + Constants.RAW_PATH + repository + "/" + (branch == null ? "" : (branch + "/" + (path == null ? "" : encodedPath)));
}
@@ -138,7 +134,8 @@
if (path.endsWith("/")) {
path = path.substring(0, path.length() - 1);
}
- return path;
+ char c = runtimeManager.getSettings().getChar(Keys.web.forwardSlashCharacter, '/');
+ return path.replace('!', '/').replace(c, '/');
}
protected boolean renderIndex() {
@@ -428,11 +425,8 @@
}
}
- private void streamFromRepo(HttpServletResponse response, Repository repository,
+ 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");
RevWalk rw = new RevWalk(repository);
TreeWalk tw = new TreeWalk(repository);
@@ -464,9 +458,8 @@
response.flushBuffer();
}
- private 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");
+ protected void sendContent(HttpServletResponse response, Date date, InputStream is) throws ServletException, IOException {
+
try {
byte[] tmp = new byte[8192];
int len = 0;
--
Gitblit v1.9.1