Merge pull request gitblit-org#1201 from j123b567/bug/1114

Fix gitblit-org#1114 HttpUtils getGitblitURL does not support nonstandard ports
Janix520 · Feb 16, 2017 · d54dc04 · d54dc04
2 parents b03fc53 + 49bec41
commit d54dc04
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/com/gitblit/utils/HttpUtils.java b/src/main/java/com/gitblit/utils/HttpUtils.java
@@ -110,7 +110,9 @@ public static String getGitblitURL(HttpServletRequest request) {
 		sb.append(host);
 		if (("http".equals(scheme) && port != 80)
 				|| ("https".equals(scheme) && port != 443)) {
-			sb.append(":").append(port);
+			if (!host.endsWith(":" + port)) {
+				sb.append(":").append(port);
+			}
 		}
 		sb.append(context);
 		return sb.toString();