File tree 4 files changed +12
-22
lines changed
4 files changed +12
-22
lines changed Original file line number Diff line number Diff line change @@ -9,7 +9,6 @@ import url from 'url'
9
9
import { Redirect } from '../../../../types'
10
10
import setupDebug from 'next/dist/compiled/debug'
11
11
import { getCloneableBody } from '../../body-streams'
12
- import { filterReqHeaders , ipcForbiddenHeaders } from '../server-ipc/utils'
13
12
import { Header } from '../../../lib/load-custom-routes'
14
13
import { stringifyQuery } from '../../server-route-utils'
15
14
import { formatHostname } from '../format-hostname'
@@ -457,7 +456,7 @@ export function getResolveRoutes(
457
456
const { res : mockedRes } = await createRequestResponseMocks ( {
458
457
url : req . url || '/' ,
459
458
method : req . method || 'GET' ,
460
- headers : filterReqHeaders ( invokeHeaders , ipcForbiddenHeaders ) ,
459
+ headers : invokeHeaders ,
461
460
resWriter ( chunk ) {
462
461
readableController . enqueue ( Buffer . from ( chunk ) )
463
462
return true
@@ -560,7 +559,7 @@ export function getResolveRoutes(
560
559
delete middlewareHeaders [ 'x-middleware-next' ]
561
560
562
561
for ( const [ key , value ] of Object . entries ( {
563
- ...filterReqHeaders ( middlewareHeaders , ipcForbiddenHeaders ) ,
562
+ ...middlewareHeaders ,
564
563
} ) ) {
565
564
if (
566
565
[
Original file line number Diff line number Diff line change 1
1
import type { IncomingMessage } from 'http'
2
2
import type { Readable } from 'stream'
3
- import { filterReqHeaders , ipcForbiddenHeaders } from './utils'
4
3
5
4
export const invokeRequest = async (
6
5
targetUrl : string ,
@@ -11,13 +10,10 @@ export const invokeRequest = async (
11
10
} ,
12
11
readableBody ?: Readable | ReadableStream
13
12
) => {
14
- const invokeHeaders = filterReqHeaders (
15
- {
16
- 'cache-control' : '' ,
17
- ...requestInit . headers ,
18
- } ,
19
- ipcForbiddenHeaders
20
- ) as IncomingMessage [ 'headers' ]
13
+ const invokeHeaders = {
14
+ 'cache-control' : '' ,
15
+ ...requestInit . headers ,
16
+ }
21
17
22
18
return await fetch ( targetUrl , {
23
19
headers : invokeHeaders as any as Headers ,
Original file line number Diff line number Diff line change 1
- export const ipcForbiddenHeaders = [
1
+ export const actionsForbiddenHeaders = [
2
2
'accept-encoding' ,
3
3
'keepalive' ,
4
4
'keep-alive' ,
@@ -8,10 +8,7 @@ export const ipcForbiddenHeaders = [
8
8
'connection' ,
9
9
// marked as unsupported by undici: https://github.com/nodejs/undici/blob/c83b084879fa0bb8e0469d31ec61428ac68160d5/lib/core/request.js#L354
10
10
'expect' ,
11
- ]
12
-
13
- export const actionsForbiddenHeaders = [
14
- ...ipcForbiddenHeaders ,
11
+ // action specific
15
12
'content-length' ,
16
13
]
17
14
Original file line number Diff line number Diff line change @@ -93,7 +93,6 @@ import { nodeFs } from './lib/node-fs-methods'
93
93
import { getRouteRegex } from '../shared/lib/router/utils/route-regex'
94
94
import { invokeRequest } from './lib/server-ipc/invoke-request'
95
95
import { pipeReadable } from './pipe-readable'
96
- import { filterReqHeaders , ipcForbiddenHeaders } from './lib/server-ipc/utils'
97
96
import { createRequestResponseMocks } from './lib/mock-request'
98
97
import { NEXT_RSC_UNION_QUERY } from '../client/components/app-router-headers'
99
98
import { signalFromNodeResponse } from './web/spec-extension/adapters/next-request'
@@ -539,13 +538,12 @@ export default class NextNodeServer extends BaseServer {
539
538
signal : signalFromNodeResponse ( res . originalResponse ) ,
540
539
}
541
540
)
542
- const filteredResHeaders = filterReqHeaders (
543
- toNodeOutgoingHttpHeaders ( invokeRes . headers ) ,
544
- ipcForbiddenHeaders
541
+ const nodeOutgoingHttpHeaders = toNodeOutgoingHttpHeaders (
542
+ invokeRes . headers
545
543
)
546
544
547
- for ( const key of Object . keys ( filteredResHeaders ) ) {
548
- newRes . setHeader ( key , filteredResHeaders [ key ] || '' )
545
+ for ( const key of Object . keys ( nodeOutgoingHttpHeaders ) ) {
546
+ newRes . setHeader ( key , nodeOutgoingHttpHeaders [ key ] || '' )
549
547
}
550
548
newRes . statusCode = invokeRes . status || 200
551
549
You can’t perform that action at this time.
0 commit comments