Browse Source

pkg/context: expose port in import path for 'go-get=1' (#5305)

Unknwon 6 years ago
parent
commit
a7e8187a0d
3 changed files with 9 additions and 3 deletions
  1. 1 1
      gogs.go
  2. 7 1
      pkg/context/context.go
  3. 1 1
      templates/.VERSION

+ 1 - 1
gogs.go

@@ -16,7 +16,7 @@ import (
 	"github.com/gogs/gogs/pkg/setting"
 )
 
-const APP_VER = "0.11.74.1202"
+const APP_VER = "0.11.75.1203"
 
 func init() {
 	setting.AppVer = APP_VER

+ 7 - 1
pkg/context/context.go

@@ -263,6 +263,12 @@ func Contexter() macaron.Handler {
 				branchName = repo.DefaultBranch
 			}
 
+			// Non-80 port needs to match port number in import path as well
+			host := setting.Domain
+			if setting.HTTPPort != "80" {
+				host += ":" + setting.HTTPPort
+			}
+
 			prefix := setting.AppURL + path.Join(ownerName, repoName, "src", branchName)
 			c.PlainText(http.StatusOK, []byte(com.Expand(`<!doctype html>
 <html>
@@ -275,7 +281,7 @@ func Contexter() macaron.Handler {
 	</body>
 </html>
 `, map[string]string{
-				"GoGetImport":    path.Join(setting.Domain, setting.AppSubURL, repo.FullName()),
+				"GoGetImport":    path.Join(host, setting.AppSubURL, repo.FullName()),
 				"CloneLink":      models.ComposeHTTPSCloneURL(ownerName, repoName),
 				"GoDocDirectory": prefix + "{/dir}",
 				"GoDocFile":      prefix + "{/dir}/{file}#L{line}",

+ 1 - 1
templates/.VERSION

@@ -1 +1 @@
-0.11.74.1202
+0.11.75.1203