Unverified Commit 4a22059b authored by Hiroshi Ogawa's avatar Hiroshi Ogawa Committed by GitHub

fix(30724): clear "x-middleware-next" header when chaining middlewares (#30866)

* fix(30724): clear "x-middleware-next" header when chaining middlewares

* refactor: do not accumulate "x-middleware-next" header

* test: fix grammar of test case title

* Update packages/next/server/next-server.ts
Co-authored-by: 's avatarJavi Velasco <javier.velasco86@gmail.com>
parent d9fc3eeb
...@@ -700,7 +700,9 @@ export default class Server { ...@@ -700,7 +700,9 @@ export default class Server {
}) })
for (let [key, value] of result.response.headers) { for (let [key, value] of result.response.headers) {
allHeaders.append(key, value) if (key !== 'x-middleware-next') {
allHeaders.append(key, value)
}
} }
if (!this.renderOpts.dev) { if (!this.renderOpts.dev) {
......
import { NextResponse } from 'next/server' import { NextResponse } from 'next/server'
export async function middleware(request, _event) { export async function middleware(request, _event) {
if (request.nextUrl.searchParams.get('deep-intercept') === 'true') {
return new NextResponse('intercepted!')
}
const next = NextResponse.next() const next = NextResponse.next()
next.headers.set('x-deep-header', 'valid') next.headers.set('x-deep-header', 'valid')
next.headers.append('x-append-me', 'deep') next.headers.append('x-append-me', 'deep')
......
...@@ -341,6 +341,14 @@ function responseTests(locale = '') { ...@@ -341,6 +341,14 @@ function responseTests(locale = '') {
'foo=oatmeal', 'foo=oatmeal',
]) ])
}) })
it(`${locale} should be intercepted by deep middleware`, async () => {
const res = await fetchViaHTTP(
context.appPort,
`${locale}/responses/deep?deep-intercept=true`
)
expect(await res.text()).toBe('intercepted!')
})
} }
function interfaceTests(locale = '') { function interfaceTests(locale = '') {
......
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