From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Thu, 19 Oct 2017 08:09:04 +0000 (+0200)
Subject: commands: Support Fast Render mode with sub-path in baseURL
X-Git-Tag: v0.30.2~5
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3164103310fbca1211cfa9ce4a5eb7437854b6ad;p=brevno-suite%2Fhugo

commands: Support Fast Render mode with sub-path in baseURL

Fixes #3981
---

diff --git a/commands/hugo.go b/commands/hugo.go
index a86d92ac..5961ede3 100644
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -771,8 +771,9 @@ func (c *commandeer) rebuildSites(events []fsnotify.Event) error {
 	visited := c.visitedURLs.PeekAllSet()
 	doLiveReload := !buildWatch && !c.Cfg.GetBool("disableLiveReload")
 	if doLiveReload && !c.Cfg.GetBool("disableFastRender") {
+		home := c.pathSpec.PrependBasePath("/")
 		// Make sure we always render the home page
-		visited["/"] = true
+		visited[home] = true
 	}
 	return Hugo.Build(hugolib.BuildCfg{PrintStats: !quiet, Watching: true, RecentlyVisited: visited}, events...)
 }
diff --git a/commands/server.go b/commands/server.go
index 8c22d1d9..e2d37f16 100644
--- a/commands/server.go
+++ b/commands/server.go
@@ -238,7 +238,7 @@ func (c *commandeer) serve(port int) {
 			}
 
 			if fastRenderMode {
-				p := r.URL.Path
+				p := r.RequestURI
 				if strings.HasSuffix(p, "/") || strings.HasSuffix(p, "html") || strings.HasSuffix(p, "htm") {
 					c.visitedURLs.Add(p)
 				}