ynerant/ghostream
1
0
Fork 0
mirror of https://gitlab.crans.org/nounous/ghostream.git synced 2024-12-22 20:52:20 +00:00
Code Issues Releases Wiki Activity

Don't split domain if we use standard HTTP ports

Browse Source
This commit is contained in:
Yohann D'ANELLO 2020-10-04 18:10:11 +02:00
parent d5ada0bce7
commit 7831238375
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web/handler.go
View File

@ -7,6 +7,7 @@ import (
"log" "log"
"net" "net"
"net/http" "net/http"
"strings"
"github.com/markbates/pkger" "github.com/markbates/pkger"
"gitlab.crans.org/nounous/ghostream/internal/monitoring" "gitlab.crans.org/nounous/ghostream/internal/monitoring"
@ -49,10 +50,14 @@ func viewerGetHandler(w http.ResponseWriter, r *http.Request) {
// Get stream ID from URL, or from domain name // Get stream ID from URL, or from domain name
path := r.URL.Path[1:] path := r.URL.Path[1:]
if cfg.OneStreamPerDomain { if cfg.OneStreamPerDomain {
host, _, err := net.SplitHostPort(r.Host) var host = r.Host
if err != nil { if strings.Contains(host, ":") {
log.Printf("Failed to split host and port from %s", r.Host) realHost, _, err := net.SplitHostPort(r.Host)
return if err != nil {
log.Printf("Failed to split host and port from %s", r.Host)
return
}
host = realHost
} }
path = host path = host
} }