Fix raw servlet trashing paths with spaces

gitblit · gitblit · commit 9ceddb66153d · 2014-10-26T10:16:49.000-04:00
diff --git a/releases.moxie b/releases.moxie
@@ -11,11 +11,13 @@ r26: {
     security: ~
     fixes:
     - Fix French translation (pr-224, ticket-210)
+    - Fix raw servlet trashing paths with spaces (ticket-211)
     changes: ~
     additions: ~
     dependencyChanges: ~
     contributors:
     - Pierre Templier
+    - Barry Roberts 
 }
 
 #
diff --git a/src/main/java/com/gitblit/servlet/RawServlet.java b/src/main/java/com/gitblit/servlet/RawServlet.java
@@ -104,9 +104,8 @@ public static String asLink(String baseURL, String repository, String branch, St
 			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) {

Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,13 @@ r26: {`
`11`	`11`	`security: ~`
`12`	`12`	`fixes:`
`13`	`13`	`- Fix French translation (pr-224, ticket-210)`
	`14`	`+ - Fix raw servlet trashing paths with spaces (ticket-211)`
`14`	`15`	`changes: ~`
`15`	`16`	`additions: ~`
`16`	`17`	`dependencyChanges: ~`
`17`	`18`	`contributors:`
`18`	`19`	`- Pierre Templier`
	`20`	`+ - Barry Roberts`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`#`
Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,8 @@ public static String asLink(String baseURL, String repository, String branch, St`
`104`	`104`	`branch = Repository.shortenRefName(branch).replace('/', fsc);`
`105`	`105`	`}`
`106`	`106`
`107`		`- String encodedPath = path == null ? "" : path.replace(' ', '-');`
`108`		`- encodedPath = encodedPath.replace('/', fsc);`
`109`		`- return baseURL + Constants.RAW_PATH + repository + "/" + (branch == null ? "" : (branch + "/" + (path == null ? "" : encodedPath)));`
	`107`	`+ String encodedPath = path == null ? "" : path.replace('/', fsc);`
	`108`	`+ return baseURL + Constants.RAW_PATH + repository + "/" + (branch == null ? "" : (branch + "/" + encodedPath));`
`110`	`109`	`}`
`111`	`110`
`112`	`111`	`protected String getBranch(String repository, HttpServletRequest request) {`