Unverified Commit 819453e3 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Fix dev ipc request on node v16 (#47825)

This ensures we filter conflicting headers from the initial request when
passing it to a render worker since undici in Node.js v16 fails on
these.

x-ref:
https://github.com/vercel/next.js/actions/runs/4588955268/jobs/8105263272
parent 26e8197d
...@@ -102,3 +102,25 @@ export const createWorker = ( ...@@ -102,3 +102,25 @@ export const createWorker = (
return worker return worker
} }
export const filterReqHeaders = (
headers: Record<string, undefined | string | string[]> | Headers
) => {
const forbiddenHeaders = [
'content-length',
'keepalive',
'content-encoding',
'transfer-encoding',
// https://github.com/nodejs/undici/issues/1470
'connection',
]
for (const key of forbiddenHeaders) {
if (headers instanceof Headers) {
headers.delete(key)
} else {
delete headers[key]
}
}
return headers
}
...@@ -102,6 +102,7 @@ import { getRouteRegex } from '../shared/lib/router/utils/route-regex' ...@@ -102,6 +102,7 @@ import { getRouteRegex } from '../shared/lib/router/utils/route-regex'
import { removePathPrefix } from '../shared/lib/router/utils/remove-path-prefix' import { removePathPrefix } from '../shared/lib/router/utils/remove-path-prefix'
import { addPathPrefix } from '../shared/lib/router/utils/add-path-prefix' import { addPathPrefix } from '../shared/lib/router/utils/add-path-prefix'
import { pathHasPrefix } from '../shared/lib/router/utils/path-has-prefix' import { pathHasPrefix } from '../shared/lib/router/utils/path-has-prefix'
import { filterReqHeaders } from './lib/server-ipc'
export * from './base-server' export * from './base-server'
...@@ -1409,26 +1410,7 @@ export default class NextNodeServer extends BaseServer { ...@@ -1409,26 +1410,7 @@ export default class NextNodeServer extends BaseServer {
'x-invoke-path': invokePathname, 'x-invoke-path': invokePathname,
'x-invoke-query': encodeURIComponent(invokeQuery), 'x-invoke-query': encodeURIComponent(invokeQuery),
} }
filterReqHeaders(invokeHeaders)
const forbiddenHeaders = (global as any).__NEXT_USE_UNDICI
? [
'content-length',
'keepalive',
'content-encoding',
'transfer-encoding',
// https://github.com/nodejs/undici/issues/1470
'connection',
]
: [
'content-length',
'keepalive',
'content-encoding',
'transfer-encoding',
]
for (const key of forbiddenHeaders) {
delete invokeHeaders[key]
}
const invokeRes = await fetch(renderUrl, { const invokeRes = await fetch(renderUrl, {
method: req.method, method: req.method,
...@@ -2258,14 +2240,7 @@ export default class NextNodeServer extends BaseServer { ...@@ -2258,14 +2240,7 @@ export default class NextNodeServer extends BaseServer {
...req.headers, ...req.headers,
'x-middleware-invoke': '1', 'x-middleware-invoke': '1',
} }
for (const key of [ filterReqHeaders(invokeHeaders)
'content-length',
'keepalive',
'content-encoding',
'transfer-encoding',
]) {
delete invokeHeaders[key]
}
const invokeRes = await fetch(renderUrl, { const invokeRes = await fetch(renderUrl, {
method: req.method, method: req.method,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment