Skip to content

fix!: avoid merging prepared headers when a Response is not ok #1228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pi0 merged 2 commits into from
Oct 23, 2025
Merged

fix!: avoid merging prepared headers when a Response is not ok #1228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2563f3
fix: avoid merging prepared headers when a `Response` is not ok
pi0 Oct 23, 2025
0824185
update test
pi0 Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/response.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ function prepareResponse(
);
}

// Note: Only check _headers. res.status/statusText are not used as we use them from the response
if (!preparedHeaders || nested) {
// Avoid merging if no prepared headers are provided or we are rendering an Error
if (!preparedHeaders || nested || !val.ok) {
return val; // Fast path: no headers to merge
}
try {
Expand Down
17 changes: 9 additions & 8 deletions test/errors.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,21 +127,22 @@ describeMatrix("errors", (t, { it, expect }) => {
});

it("error headers", async () => {
t.app.config.onError = async () => {
return new Response("error", {
status: 501,
headers: { "set-cookie": "error=1" },
});
t.app.config.onError = async (error, event) => {
const headers = new Headers(event.res.headers);
headers.set("set-cookie", "error=1");
return new Response(error.toString(), { status: 501, headers });
};

t.app.get("/", async (event) => {
event.res.headers.set("set-cookie", "test=1");
throw new HTTPError({ status: 501 });
event.res.headers.set("set-cookie", "auth=1");
event.res.headers.set("x-test", "1");
throw new HTTPError("test");
});

const res = await t.fetch("/");
expect(res.status).toBe(501);
expect(res.headers.getSetCookie()).toEqual(["error=1", "test=1"]);
expect(res.headers.get("x-test")).toBe("1");
expect(res.headers.getSetCookie()).toEqual(["error=1"]);

t.errors = [];
});
Expand Down