always use http scheme for localhost

fixes #758
This commit is contained in:
Nathan Youngman 2015-01-01 08:32:56 -07:00 committed by bep
parent dd1001ceda
commit c6f4b09f65
2 changed files with 2 additions and 1 deletions

View file

@ -152,6 +152,7 @@ func fixUrl(s string) (string, error) {
if serverAppend {
if useLocalhost {
u.Host = fmt.Sprintf("localhost:%d", serverPort)
u.Scheme = "http"
return u.String(), nil
}
host := u.Host

View file

@ -17,7 +17,7 @@ func TestFixUrl(t *testing.T) {
}
tests := []data{
{"Basic http localhost", "", "http://foo.com", true, 1313, "http://localhost:1313"},
{"Basic https localhost", "", "https://foo.com", true, 1313, "https://localhost:1313"},
{"Basic https production, http localhost", "", "https://foo.com", true, 1313, "http://localhost:1313"},
{"Basic subdir", "", "http://foo.com/bar", true, 1313, "http://localhost:1313/bar"},
{"Basic production", "http://foo.com", "http://foo.com", false, 80, "http://foo.com"},
{"Production subdir", "http://foo.com/bar", "http://foo.com/bar", false, 80, "http://foo.com/bar"},