github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-07 20:30:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

commands: Fix URL rewrites vs fast render server mode

Browse source 
Fixes #7357
This commit is contained in:
Bjørn Erik Pedersen 2020-06-05 12:13:26 +02:00
parent 7eeebe1e5a
commit fc0f13b684
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
commands/server.go
View file

@ -368,15 +368,19 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, string, string, erro
w.Header().Set("Pragma", "no-cache") w.Header().Set("Pragma", "no-cache")
} }
for _, header := range f.c.serverConfig.MatchHeaders(r.RequestURI) { // Ignore any query params for the operations below.
requestURI := strings.TrimSuffix(r.RequestURI, "?"+r.URL.RawQuery)
for _, header := range f.c.serverConfig.MatchHeaders(requestURI) {
w.Header().Set(header.Key, header.Value) w.Header().Set(header.Key, header.Value)
} }
if redirect := f.c.serverConfig.MatchRedirect(r.RequestURI); !redirect.IsZero() { if redirect := f.c.serverConfig.MatchRedirect(requestURI); !redirect.IsZero() {
// This matches Netlify's behaviour and is needed for SPA behaviour. // This matches Netlify's behaviour and is needed for SPA behaviour.
// See https://docs.netlify.com/routing/redirects/rewrites-proxies/ // See https://docs.netlify.com/routing/redirects/rewrites-proxies/
if redirect.Status == 200 { if redirect.Status == 200 {
if r2 := f.rewriteRequest(r, strings.TrimPrefix(redirect.To, u.Path)); r2 != nil { if r2 := f.rewriteRequest(r, strings.TrimPrefix(redirect.To, u.Path)); r2 != nil {
requestURI = redirect.To
r = r2 r = r2
} }
} else { } else {
@ -389,20 +393,19 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, string, string, erro
if f.c.fastRenderMode && f.c.buildErr == nil { if f.c.fastRenderMode && f.c.buildErr == nil {
p := strings.TrimSuffix(r.RequestURI, "?"+r.URL.RawQuery) if strings.HasSuffix(requestURI, "/") || strings.HasSuffix(requestURI, "html") || strings.HasSuffix(requestURI, "htm") {
if strings.HasSuffix(p, "/") || strings.HasSuffix(p, "html") || strings.HasSuffix(p, "htm") { if !f.c.visitedURLs.Contains(requestURI) {
if !f.c.visitedURLs.Contains(p) {
// If not already on stack, re-render that single page. // If not already on stack, re-render that single page.
if err := f.c.partialReRender(p); err != nil { if err := f.c.partialReRender(requestURI); err != nil {
f.c.handleBuildErr(err, fmt.Sprintf("Failed to render %q", p)) f.c.handleBuildErr(err, fmt.Sprintf("Failed to render %q", requestURI))
if f.c.showErrorInBrowser { if f.c.showErrorInBrowser {
http.Redirect(w, r, p, http.StatusMovedPermanently) http.Redirect(w, r, requestURI, http.StatusMovedPermanently)
return return
} }
} }
} }
f.c.visitedURLs.Add(p) f.c.visitedURLs.Add(requestURI)
} }
} }