Browse Source

Fix transport determination for SSH urls on port 22

tags/v1.5.1
James Moger 10 years ago
parent
commit
b016de996e
2 changed files with 8 additions and 1 deletions
  1. 2
    0
      releases.moxie
  2. 6
    1
      src/main/java/com/gitblit/Constants.java

+ 2
- 0
releases.moxie View File

@@ -16,6 +16,7 @@ r23: {
- Fix forcing default locale to en or LANG_CC for web ui (ticket-51)
- Fix inconsistency with repository ownership permission checking (ticket-52)
- Prevent submission from New|Edit ticket page with empty titles (ticket-53)
- Fix transport determination for SSH urls served on port 22 (issue-421, ticket-63)
changes:
- improve French translation (pr-176)
- simplify current plugin release detection and ignore the currentRelease registry field
@@ -31,6 +32,7 @@ r23: {
- Owen Nelson
- Alexander Zabluda
- Philipp Beckmann
- Jakob Boysen
}

#

+ 6
- 1
src/main/java/com/gitblit/Constants.java View File

@@ -554,7 +554,12 @@ public class Constants {
}
public static Transport fromUrl(String url) {
String scheme = url.substring(0, url.indexOf("://"));
int delim = url.indexOf("://");
if (delim == -1) {
// if no protocol is specified, SSH is assumed by git clients
return SSH;
}
String scheme = url.substring(0, delim);
return fromString(scheme);
}
}

Loading…
Cancel
Save