Merge pull request #2593 from AudriusButkevicius/httpfoo

Only override TLS settings if scheme is specified
This commit is contained in:
Jakob Borg 2015-12-19 08:47:46 +01:00
commit 9c82a4ca60

View File

@ -44,7 +44,7 @@ func (c GUIConfiguration) Address() string {
} }
func (c GUIConfiguration) UseTLS() bool { func (c GUIConfiguration) UseTLS() bool {
if override := os.Getenv("STGUIADDRESS"); override != "" { if override := os.Getenv("STGUIADDRESS"); override != "" && strings.HasPrefix(override, "http") {
return strings.HasPrefix(override, "https:") return strings.HasPrefix(override, "https:")
} }
return c.RawUseTLS return c.RawUseTLS