github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-29 21:22:12 -05:00
Code Issues Projects Releases Packages Wiki Activity

handle https prefixes in baseUrl

Browse source
This commit is contained in:
Mantas 2014-10-06 12:50:44 +03:00 committed by spf13
parent b98c2088f8
commit fb82f00f9d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
commands/server.go
View file

@ -136,7 +136,7 @@ func fixUrl(s string) (string, error) {
s = viper.GetString("BaseUrl") s = viper.GetString("BaseUrl")
useLocalhost = true useLocalhost = true
} }
if !strings.HasPrefix(s, "http://") { if !strings.HasPrefix(s, "http://") && !strings.HasPrefix(s, "https://") {
s = "http://" + s s = "http://" + s
} }
u, err := url.Parse(s) u, err := url.Parse(s)

3
commands/server_test.go
View file

@ -16,7 +16,8 @@ func TestFixUrl(t *testing.T) {
Result string Result string
} }
tests := []data{ tests := []data{
{"Basic localhost", "", "http://foo.com", true, 1313, "http://localhost:1313"}, {"Basic http localhost", "", "http://foo.com", true, 1313, "http://localhost:1313"},
{"Basic https localhost", "", "https://foo.com", true, 1313, "https://localhost:1313"},
{"Basic subdir", "", "http://foo.com/bar", true, 1313, "http://localhost:1313/bar"}, {"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"}, {"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"}, {"Production subdir", "http://foo.com/bar", "http://foo.com/bar", false, 80, "http://foo.com/bar"},