diff options
| author | James Moger <james.moger@gitblit.com> | 2014-06-16 18:52:47 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-06-16 18:52:47 -0400 |
| commit | 111b48c40cd2cc4e19e28c8b6af8379885fb617b (patch) | |
| tree | 4bdb208cede00e637ce4704d942aa045f5af5ed9 /src/main/java/com/gitblit/utils/StringUtils.java | |
| parent | ca4d98678c20e4033fdaca09ecbbf0f5952e0b84 (diff) | |
| parent | 9b575e8fac8d5e17e77cc284092abd856ddec8ac (diff) | |
| download | gitblit-111b48c40cd2cc4e19e28c8b6af8379885fb617b.tar.gz gitblit-111b48c40cd2cc4e19e28c8b6af8379885fb617b.zip | |
Merge release 1.6.0
Diffstat (limited to 'src/main/java/com/gitblit/utils/StringUtils.java')
| -rw-r--r-- | src/main/java/com/gitblit/utils/StringUtils.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/utils/StringUtils.java b/src/main/java/com/gitblit/utils/StringUtils.java index d7e1ea3d..087de543 100644 --- a/src/main/java/com/gitblit/utils/StringUtils.java +++ b/src/main/java/com/gitblit/utils/StringUtils.java @@ -129,6 +129,8 @@ public class StringUtils { retStr.append("%20");
} else if (inStr.charAt(i) == '&') {
retStr.append("%26");
+ } else if (inStr.charAt(i) == '+') {
+ retStr.append("%2B");
} else {
retStr.append(inStr.charAt(i));
}
@@ -398,7 +400,7 @@ public class StringUtils { * @return the first invalid character found or null if string is acceptable
*/
public static Character findInvalidCharacter(String name) {
- char[] validChars = { '/', '.', '_', '-', '~' };
+ char[] validChars = { '/', '.', '_', '-', '~', '+' };
for (char c : name.toCharArray()) {
if (!Character.isLetterOrDigit(c)) {
boolean ok = false;
|