Skip to content

Commit

Permalink
Fix 404 response leading to an infinite loop when there is no 404 page (
Browse files Browse the repository at this point in the history
#8136)

* fix: 404 response leads to infinite loop

* chore: changeset

---------

Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
  • Loading branch information
andremralves and natemoo-re committed Aug 18, 2023
1 parent 8c0a4ed commit 97c8760
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .changeset/lemon-comics-jump.md
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fix 404 response leading to an infinite loop when there is no 404 page.
6 changes: 5 additions & 1 deletion packages/astro/src/vite-plugin-astro-server/route.ts
Expand Up @@ -259,7 +259,7 @@ export async function handleRoute({
await writeWebResponse(incomingResponse, response);
}
} else {
if (result.status === 404) {
if (result.status === 404 && has404Route(manifestData)) {
const fourOhFourRoute = await matchRoute('/404', env, manifestData);
return handleRoute({
...options,
Expand Down Expand Up @@ -380,3 +380,7 @@ function getStatus(matchedRoute?: MatchedRoute): 404 | 500 | undefined {
if (matchedRoute.route.route === '/404') return 404;
if (matchedRoute.route.route === '/500') return 500;
}

function has404Route(manifest: ManifestData): RouteData | undefined {
return manifest.routes.find((route) => route.route === '/404')
}

0 comments on commit 97c8760

Please sign in to comment.