Fix raw servlet trashing paths with spaces

diff --git a/releases.moxie b/releases.moxie
index 222db662d59b29adb5401f00951d41411635e735..446d1619d5c577d25d3f95fdde6d3df4af080047 100644 (file)
--- 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
index ac77646fcc31ede9bc921d1c7ad5f16eba104b97..ca41d0aba2788dbebb6c7f39b8424d0540ccf0e3 100644 (file)
--- a/src/main/java/com/gitblit/servlet/RawServlet.java
+++ b/src/main/java/com/gitblit/servlet/RawServlet.java
@@ -104,9 +104,8 @@ public class RawServlet extends DaggerServlet {
                        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) {