From fc0f13b68451a09a6d6b4ce50c4217313b664176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Fri, 5 Jun 2020 12:13:26 +0200 Subject: [PATCH] commands: Fix URL rewrites vs fast render server mode Fixes #7357 --- commands/server.go | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/commands/server.go b/commands/server.go index ee3d25a41..602527253 100644 --- a/commands/server.go +++ b/commands/server.go @@ -368,15 +368,19 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, string, string, erro 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) } - 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. // See https://docs.netlify.com/routing/redirects/rewrites-proxies/ if redirect.Status == 200 { if r2 := f.rewriteRequest(r, strings.TrimPrefix(redirect.To, u.Path)); r2 != nil { + requestURI = redirect.To r = r2 } } else { @@ -389,20 +393,19 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, string, string, erro if f.c.fastRenderMode && f.c.buildErr == nil { - p := strings.TrimSuffix(r.RequestURI, "?"+r.URL.RawQuery) - if strings.HasSuffix(p, "/") || strings.HasSuffix(p, "html") || strings.HasSuffix(p, "htm") { - if !f.c.visitedURLs.Contains(p) { + if strings.HasSuffix(requestURI, "/") || strings.HasSuffix(requestURI, "html") || strings.HasSuffix(requestURI, "htm") { + if !f.c.visitedURLs.Contains(requestURI) { // If not already on stack, re-render that single page. - if err := f.c.partialReRender(p); err != nil { - f.c.handleBuildErr(err, fmt.Sprintf("Failed to render %q", p)) + if err := f.c.partialReRender(requestURI); err != nil { + f.c.handleBuildErr(err, fmt.Sprintf("Failed to render %q", requestURI)) if f.c.showErrorInBrowser { - http.Redirect(w, r, p, http.StatusMovedPermanently) + http.Redirect(w, r, requestURI, http.StatusMovedPermanently) return } } } - f.c.visitedURLs.Add(p) + f.c.visitedURLs.Add(requestURI) } }