shithub: hugo

Info  •  Files  •  Log  •  Branches

handle https prefixes in baseUrl

--- a/commands/server.go

+++ b/commands/server.go

@@ -136,7 +136,7 @@

 		s = viper.GetString("BaseUrl")

 		useLocalhost = true

 	}

-	if !strings.HasPrefix(s, "http://") {

+	if !strings.HasPrefix(s, "http://") && !strings.HasPrefix(s, "https://") {

 		s = "http://" + s

 	}

 	u, err := url.Parse(s)

--- a/commands/server_test.go

+++ b/commands/server_test.go

@@ -16,7 +16,8 @@

 		Result     string

 	}

 	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 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"},