diff options
| author | James Moger <james.moger@gitblit.com> | 2014-07-05 13:26:48 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-07-05 13:26:48 -0400 |
| commit | 9a1c75e589c1131790a41a1f5de1700721e38789 (patch) | |
| tree | 251d57dc26e78d9ace9bd47ecc199c4077d0c2c0 /src/main/java/com/gitblit/servlet | |
| parent | c2f328f8202e032271420fbf533d97388fb583b9 (diff) | |
| parent | f010ef67e4fece736f005050ef63ad5a62c68c8b (diff) | |
| download | gitblit-9a1c75e589c1131790a41a1f5de1700721e38789.tar.gz gitblit-9a1c75e589c1131790a41a1f5de1700721e38789.zip | |
Merge branch 'ticket/139' into develop
Conflicts:
src/main/java/com/gitblit/servlet/RawServlet.java
Diffstat (limited to 'src/main/java/com/gitblit/servlet')
| -rw-r--r-- | src/main/java/com/gitblit/servlet/RawServlet.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/main/java/com/gitblit/servlet/RawServlet.java b/src/main/java/com/gitblit/servlet/RawServlet.java index 80241089..062b240e 100644 --- a/src/main/java/com/gitblit/servlet/RawServlet.java +++ b/src/main/java/com/gitblit/servlet/RawServlet.java @@ -110,10 +110,6 @@ public class RawServlet extends HttpServlet { 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 @@ public class RawServlet extends HttpServlet { 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() { |