diff options
author | James Moger <james.moger@gitblit.com> | 2014-07-05 13:07:04 -0400 |
---|---|---|
committer | James Moger <james.moger@gitblit.com> | 2014-07-05 13:07:04 -0400 |
commit | c2f328f8202e032271420fbf533d97388fb583b9 (patch) | |
tree | 9030e4adfc58228312db2e75b7159ae168081277 /src/main/java/com/gitblit/servlet | |
parent | 34d7d04aa8a1a7706be333f5eb0a4aec7f066850 (diff) | |
parent | 58562a1348536c460547329c6b1aa2c1ebc4665f (diff) | |
download | gitblit-c2f328f8202e032271420fbf533d97388fb583b9.tar.gz gitblit-c2f328f8202e032271420fbf533d97388fb583b9.zip |
Merge branch 'ticket/139' into develop
Diffstat (limited to 'src/main/java/com/gitblit/servlet')
-rw-r--r-- | src/main/java/com/gitblit/servlet/RawServlet.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/com/gitblit/servlet/RawServlet.java b/src/main/java/com/gitblit/servlet/RawServlet.java index 498eaf1f..80241089 100644 --- a/src/main/java/com/gitblit/servlet/RawServlet.java +++ b/src/main/java/com/gitblit/servlet/RawServlet.java @@ -99,16 +99,17 @@ public class RawServlet extends HttpServlet { baseURL = baseURL.substring(0, baseURL.length() - 1); } + char fsc = '!'; + char c = GitblitContext.getManager(IRuntimeManager.class).getSettings().getChar(Keys.web.forwardSlashCharacter, '/'); + if (c != '/') { + fsc = c; + } if (branch != null) { - char fsc = '!'; - char c = GitblitContext.getManager(IRuntimeManager.class).getSettings().getChar(Keys.web.forwardSlashCharacter, '/'); - if (c != '/') { - fsc = c; - } branch = branch.replace('/', fsc); } String encodedPath = path == null ? "" : path.replace(' ', '-'); + encodedPath = encodedPath.replace('/', fsc); try { encodedPath = URLEncoder.encode(encodedPath, "UTF-8"); } catch (UnsupportedEncodingException e) { |