Преглед на файлове

expose port in import path for 'go-get=1'

Yoginth преди 7 години
родител
ревизия
ee53502a60
променени са 1 файла, в които са добавени 7 реда и са изтрити 1 реда
  1. 7 1
      pkg/context/context.go

+ 7 - 1
pkg/context/context.go

@@ -266,6 +266,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>
@@ -278,7 +284,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}",