From 707ebe1a499e1b8a5a2e97e9347d90aa7be643dc Mon Sep 17 00:00:00 2001 From: sentriz Date: Sun, 26 Nov 2023 15:31:06 +0000 Subject: [PATCH] remove redundant fallback host --- handlerutil/handlerutil.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/handlerutil/handlerutil.go b/handlerutil/handlerutil.go index 80b929e..4116dc7 100644 --- a/handlerutil/handlerutil.go +++ b/handlerutil/handlerutil.go @@ -69,21 +69,20 @@ func Message(message string) http.Handler { } func BaseURL(r *http.Request) string { - fallbackProtocoll := "http" + var fallbackScheme = "http" if r.TLS != nil { - fallbackProtocoll = "https" + fallbackScheme = "https" } - fallbackHost := "localhost:4747" scheme := first( r.Header.Get("X-Forwarded-Proto"), r.Header.Get("X-Forwarded-Scheme"), r.URL.Scheme, - fallbackProtocoll, + fallbackScheme, ) host := first( r.Header.Get("X-Forwarded-Host"), + r.URL.Host, r.Host, - fallbackHost, ) return fmt.Sprintf("%s://%s", scheme, host) }