diff options
| author | Wim <wim@42.be> | 2020-07-26 22:31:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-26 16:31:28 -0400 |
| commit | 4609eba2e7683acde13231fb02747e3b2e09ff45 (patch) | |
| tree | 42982792623d4a77a9783a7e222a2d98dd329741 /cmd | |
| parent | 415fc8288ff9c83c99939003657db3c6ac978a3e (diff) | |
| download | gitea-4609eba2e7683acde13231fb02747e3b2e09ff45.tar.gz gitea-4609eba2e7683acde13231fb02747e3b2e09ff45.zip | |
Fix ipv6 parsing (#12321)
* Fix ipv6 parsing
* Update modules/setting/setting.go
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/web.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/web.go b/cmd/web.go index 243b9a4108..6efadb9419 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -7,6 +7,7 @@ package cmd import ( "context" "fmt" + "net" "net/http" _ "net/http/pprof" // Used for debugging if enabled and a web server is running "os" @@ -156,7 +157,7 @@ func runWeb(ctx *cli.Context) error { listenAddr := setting.HTTPAddr if setting.Protocol != setting.UnixSocket && setting.Protocol != setting.FCGIUnix { - listenAddr += ":" + setting.HTTPPort + listenAddr = net.JoinHostPort(listenAddr, setting.HTTPPort) } log.Info("Listen: %v://%s%s", setting.Protocol, listenAddr, setting.AppSubURL) |