phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-07-05 08:42:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that BaseUrl used in hugo server ends with /

Browse source 
Fixes #793, #799
This commit is contained in:
Anthony Fok 2015-01-15 18:02:19 -07:00
parent 9150a98f3e
commit 1cbdd3e59d
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
commands/server.go
View file

@ -135,6 +135,8 @@ func serve(port int) {
} }
} }
// fixUrl massages the BaseUrl into a form needed for serving
// all pages correctly.
func fixUrl(s string) (string, error) { func fixUrl(s string) (string, error) {
useLocalhost := false useLocalhost := false
if s == "" { if s == "" {
@ -144,6 +146,9 @@ func fixUrl(s string) (string, error) {
if !strings.HasPrefix(s, "http://") && !strings.HasPrefix(s, "https://") { if !strings.HasPrefix(s, "http://") && !strings.HasPrefix(s, "https://") {
s = "http://" + s s = "http://" + s
} }
if !strings.HasSuffix(s, "/") {
s = s + "/"
}
u, err := url.Parse(s) u, err := url.Parse(s)
if err != nil { if err != nil {
return "", err return "", err