From c2f328f8202e032271420fbf533d97388fb583b9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 05 Jul 2014 13:07:04 -0400
Subject: [PATCH] Merge branch 'ticket/139' into develop
---
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 498eaf1..8024108 100644
--- a/src/main/java/com/gitblit/servlet/RawServlet.java
+++ b/src/main/java/com/gitblit/servlet/RawServlet.java
@@ -99,16 +99,17 @@
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) {
--
Gitblit v1.9.1