From 2d10e4ef95f3bd317883a702a7b991b1ac77ae62 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 26 Feb 2015 11:20:23 -0500 Subject: [PATCH] Merged #242 "issue-545: Enforce repository permissions in patch page" --- src/main/java/com/gitblit/servlet/RawServlet.java | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gitblit/servlet/RawServlet.java b/src/main/java/com/gitblit/servlet/RawServlet.java index 7504b4b..ca41d0a 100644 --- a/src/main/java/com/gitblit/servlet/RawServlet.java +++ b/src/main/java/com/gitblit/servlet/RawServlet.java @@ -104,9 +104,8 @@ branch = Repository.shortenRefName(branch).replace('/', fsc); } - String encodedPath = path == null ? "" : path.replace(' ', '-'); - encodedPath = encodedPath.replace('/', fsc); - return baseURL + Constants.RAW_PATH + repository + "/" + (branch == null ? "" : (branch + "/" + (path == null ? "" : encodedPath))); + String encodedPath = path == null ? "" : path.replace('/', fsc); + return baseURL + Constants.RAW_PATH + repository + "/" + (branch == null ? "" : (branch + "/" + encodedPath)); } protected String getBranch(String repository, HttpServletRequest request) { @@ -172,10 +171,7 @@ } else { repository = path.substring(0, slash); } - offset += slash; - if (offset == 0) { - offset++; - } + offset = ( slash + 1 ); r = repositoryManager.getRepository(repository, false); if (repository.equals(path)) { // either only repository in url or no repository found -- Gitblit v1.9.1