Skip to content

[fix] fetch erroring on Cloudflare #7192

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

Closed
The-Noah wants to merge 1 commit into from
Closed

[fix] fetch erroring on Cloudflare #7192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/tidy-tables-think.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

[fix] fetch erroring on Cloudflare
9 changes: 5 additions & 4 deletions packages/kit/src/runtime/server/fetch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ export function create_fetch({ event, options, state, get_cookie_header }) {
// Remove Origin, according to https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Origin#description
if (
(request.method === 'GET' || request.method === 'HEAD') &&
((request.mode === 'no-cors' && url.origin !== event.url.origin) ||
((('cf' in request ? 'cors' : request.mode) === 'no-cors' &&
url.origin !== event.url.origin) ||
url.origin === event.url.origin)
) {
request.headers.delete('origin');
Expand All @@ -51,15 +52,15 @@ export function create_fetch({ event, options, state, get_cookie_header }) {
// leading dot prevents mydomain.com matching domain.com
if (
`.${url.hostname}`.endsWith(`.${event.url.hostname}`) &&
request.credentials !== 'omit'
('cf' in request ? 'same-origin' : request.credentials) !== 'omit'
) {
const cookie = get_cookie_header(url, request.headers.get('cookie'));
if (cookie) request.headers.set('cookie', cookie);
}

let response = await fetch(request);

if (request.mode === 'no-cors') {
if (('cf' in request ? 'cors' : request.mode) === 'no-cors') {
response = new Response('', {
status: response.status,
statusText: response.statusText,
Expand Down Expand Up @@ -112,7 +113,7 @@ export function create_fetch({ event, options, state, get_cookie_header }) {
return await fetch(request);
}

if (request.credentials !== 'omit') {
if (('cf' in request ? 'same-origin' : request.credentials) !== 'omit') {
const cookie = get_cookie_header(url, request.headers.get('cookie'));
if (cookie) {
request.headers.set('cookie', cookie);
Expand Down