Skip to content

Commit

Permalink
chore: address feedback from #7754 (#7906)
Browse files Browse the repository at this point in the history
  • Loading branch information
natemoo-re authored Aug 1, 2023
1 parent 1d9e34b commit 70bbec9
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions packages/astro/src/core/app/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ export class App {
}

/**
* If is a known error code, try sending the according page (e.g. 404.astro / 500.astro).
* If it is a known error code, try sending the according page (e.g. 404.astro / 500.astro).
* This also handles pre-rendered /404 or /500 routes
*/
async #renderError(
Expand Down Expand Up @@ -319,8 +319,10 @@ export class App {
const { status, statusText, headers } = oldResponse;

return new Response(newResponse.body, {
// If the original status was 200 (default), override it with the new status (probably 404 or 500)
// Otherwise, the user set a specific status while rendering and we should respect that one
status: status === 200 ? newResponse.status : status,
statusText,
statusText: status === 200 ? newResponse.statusText : statusText,
headers: new Headers(Array.from(headers)),
});
}
Expand Down

0 comments on commit 70bbec9

Please sign in to comment.