Commite291e8c

committed

rename

1 parentc623e5b commite291e8cCopy full SHA for e291e8c

File tree

-7

lines changed

-7

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -369,16 +369,16 @@ func (s ServerTailnet) ReverseProxy(targetURL, dashboardURL url.URL, agentID u`
`369`	`369`	`Scheme:dashboardURL.Scheme,`
`370`	`370`	`}`
`371`	`371`	`ifapp.IsPort() {`
`372`		`-ifapp.Protocol()=="https" {`
	`372`	`+ifapp.PortProtocol()=="https" {`
`373`	`373`	`app.ChangePortProtocol("http")`
`374`	`374`	`}else {`
`375`	`375`	`app.ChangePortProtocol("https")`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`switchURL.Host=fmt.Sprintf("%s%s",app.String(),strings.TrimPrefix(wildcardHostname,"*"))`
`379`	`379`	`switchLink=switchURL.String()`
`380`		`-switchTarget=app.Protocol()`
`381`		`-additional+=fmt.Sprintf("This error seems to be due to an app protocol mismatch, try switching to %s.",strings.ToUpper(app.Protocol()))`
	`380`	`+switchTarget=app.PortProtocol()`
	`381`	`+additional+=fmt.Sprintf("This error seems to be due to an app protocol mismatch, try switching to %s.",strings.ToUpper(app.PortProtocol()))`
`382`	`382`	`}`
`383`	`383`	`}`
`384`	`384`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func (a ApplicationURL) IsPort() bool {`
`107`	`107`	`returntrue`
`108`	`108`	`}`
`109`	`109`
`110`		`-func (aApplicationURL)Protocol()string {`
	`110`	`+func (aApplicationURL)PortProtocol()string {`
`111`	`111`	`ifstrings.HasSuffix(a.AppSlugOrPort,"s") {`
`112`	`112`	`trimmed:=strings.TrimSuffix(a.AppSlugOrPort,"s")`
`113`	`113`	`_,err:=strconv.ParseInt(trimmed,10,64)`
`@@ -121,7 +121,7 @@ func (a ApplicationURL) Protocol() string {`
`121`	`121`
`122`	`122`	`func (a*ApplicationURL)ChangePortProtocol(targetstring) {`
`123`	`123`	`iftarget=="http" {`
`124`		`-ifa.Protocol()=="http" {`
	`124`	`+ifa.PortProtocol()=="http" {`
`125`	`125`	`return`
`126`	`126`	`}`
`127`	`127`	`trimmed:=strings.TrimSuffix(a.AppSlugOrPort,"s")`
`@@ -132,7 +132,7 @@ func (a *ApplicationURL) ChangePortProtocol(target string) {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`iftarget=="https" {`
`135`		`-ifa.Protocol()=="https" {`
	`135`	`+ifa.PortProtocol()=="https" {`
`136`	`136`	`return`
`137`	`137`	`}`
`138`	`138`	`_,err:=strconv.ParseInt(a.AppSlugOrPort,10,64)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -546,7 +546,7 @@ func (s Server) proxyWorkspaceApp(rw http.ResponseWriter, r http.Request, appT`
`546`	`546`	`r.URL.Path=path`
`547`	`547`	`appURL.RawQuery=""`
`548`	`548`	`ifapp.IsPort() {`
`549`		`-appURL.Scheme=app.Protocol()`
	`549`	`+appURL.Scheme=app.PortProtocol()`
`550`	`550`	`}`
`551`	`551`
`552`	`552`	`proxy:=s.AgentProvider.ReverseProxy(appURL,s.DashboardURL,appToken.AgentID,app,s.Hostname)`

Comments

(0)