Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/clear-spies-wear.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

allow multiple server-timing headers
6 changes: 5 additions & 1 deletion packages/kit/src/runtime/server/respond.js
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,11 @@ export async function internal_respond(request, options, manifest, state) {
'Use `event.cookies.set(name, value, options)` instead of `event.setHeaders` to set cookies'
);
} else if (lower in headers) {
throw new Error(`"${key}" header is already set`);
if (lower === 'server-timing') {
headers[lower] += ', ' + value;
} else {
throw new Error(`"${key}" header is already set`);
}
} else {
headers[lower] = value;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/** @type {import('./$types').LayoutServerLoad} */
export function load({ setHeaders }) {
setHeaders({
'server-timing': 'db;dur=53'
});
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<slot />
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/** @type {import('./$types').PageServerLoad} */
export function load({ setHeaders }) {
setHeaders({
'server-timing': 'external-api;dur=250'
});
}
6 changes: 6 additions & 0 deletions packages/kit/test/apps/basics/test/server.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -785,6 +785,12 @@ test.describe('setHeaders', () => {
expect(cookies).toMatch('cookie1=value1');
expect(cookies).toMatch('cookie2=value2');
});
test('allows multiple server-timing headers with different values', async ({ page }) => {
const response = await page.goto('/headers/server-timing/sub');
const serverTiming = response ? (await response.allHeaders())['server-timing'] : '';

expect(serverTiming).toMatch('db;dur=53, external-api;dur=250');
});
});

test.describe('cookies', () => {
Expand Down
Loading