Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
05c44d52
Commit
05c44d52
authored
Jan 09, 2026
by
Jiachi Liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
still need encoded keys list
parent
505ef11a
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
12 deletions
+28
-12
base-server.ts
packages/next/src/server/base-server.ts
+16
-11
utils.ts
packages/next/src/server/lib/server-ipc/utils.ts
+1
-0
response.ts
packages/next/src/server/web/spec-extension/response.ts
+11
-1
No files found.
packages/next/src/server/base-server.ts
View file @
05c44d52
...
@@ -943,19 +943,24 @@ export default abstract class Server<
...
@@ -943,19 +943,24 @@ export default abstract class Server<
isNodeNextResponse
(
res
)
?
res
.
originalResponse
:
res
isNodeNextResponse
(
res
)
?
res
.
originalResponse
:
res
)
)
// In minimal mode (Vercel), decode percent-encoded header values.
// In minimal mode (Vercel), decode headers that were percent-encoded by middleware
// Middleware encodes non-ASCII characters for safe HTTP transport,
// to preserve non-ASCII characters during transport. Only decode headers explicitly
// and we decode them here to restore the original values.
// marked as encoded to avoid affecting other headers with intentional percent-encoding.
// Note: decodeHeaderValue is safe - it only decodes valid percent-encoded
// sequences and returns the original value if decoding fails.
if
(
this
.
minimalMode
)
{
if
(
this
.
minimalMode
)
{
for
(
const
key
of
Object
.
keys
(
req
.
headers
))
{
const
encodedHeadersList
=
req
.
headers
[
'x-middleware-request-encoded'
]
const
value
=
req
.
headers
[
key
]
if
(
typeof
encodedHeadersList
===
'string'
)
{
if
(
typeof
value
===
'string'
)
{
const
encodedHeaders
=
encodedHeadersList
.
split
(
','
)
req
.
headers
[
key
]
=
decodeHeaderValue
(
value
)
for
(
const
headerName
of
encodedHeaders
)
{
}
else
if
(
Array
.
isArray
(
value
))
{
const
trimmedName
=
headerName
.
trim
()
req
.
headers
[
key
]
=
value
.
map
(
decodeHeaderValue
)
const
headerValue
=
req
.
headers
[
trimmedName
]
}
if
(
typeof
headerValue
===
'string'
)
{
req
.
headers
[
trimmedName
]
=
decodeHeaderValue
(
headerValue
)
}
else
if
(
Array
.
isArray
(
headerValue
))
{
req
.
headers
[
trimmedName
]
=
headerValue
.
map
(
decodeHeaderValue
)
}
}
// Clean up the marker header
delete
req
.
headers
[
'x-middleware-request-encoded'
]
}
}
}
}
...
...
packages/next/src/server/lib/server-ipc/utils.ts
View file @
05c44d52
...
@@ -45,6 +45,7 @@ const INTERNAL_HEADERS = [
...
@@ -45,6 +45,7 @@ const INTERNAL_HEADERS = [
'x-middleware-set-cookie'
,
'x-middleware-set-cookie'
,
'x-middleware-skip'
,
'x-middleware-skip'
,
'x-middleware-override-headers'
,
'x-middleware-override-headers'
,
'x-middleware-request-encoded'
,
'x-middleware-next'
,
'x-middleware-next'
,
'x-now-route-matches'
,
'x-now-route-matches'
,
'x-matched-path'
,
'x-matched-path'
,
...
...
packages/next/src/server/web/spec-extension/response.ts
View file @
05c44d52
...
@@ -23,14 +23,24 @@ function handleMiddlewareField(
...
@@ -23,14 +23,24 @@ function handleMiddlewareField(
}
}
const
keys
=
[]
const
keys
=
[]
const
encodedKeys
=
[]
for
(
const
[
key
,
value
]
of
init
.
request
.
headers
)
{
for
(
const
[
key
,
value
]
of
init
.
request
.
headers
)
{
// Encode non-ASCII characters for safe HTTP header transmission.
// Encode non-ASCII characters for safe HTTP header transmission.
// If value is already percent-encoded (all ASCII), it passes through unchanged.
// If value is already percent-encoded (all ASCII), it passes through unchanged.
headers
.
set
(
'x-middleware-request-'
+
key
,
encodeHeaderValue
(
value
))
const
encodedValue
=
encodeHeaderValue
(
value
)
headers
.
set
(
'x-middleware-request-'
+
key
,
encodedValue
)
keys
.
push
(
key
)
keys
.
push
(
key
)
// Track headers that were actually encoded (value changed)
if
(
encodedValue
!==
value
)
{
encodedKeys
.
push
(
key
)
}
}
}
headers
.
set
(
'x-middleware-override-headers'
,
keys
.
join
(
','
))
headers
.
set
(
'x-middleware-override-headers'
,
keys
.
join
(
','
))
// Add marker for headers that were percent-encoded, so server knows which to decode
if
(
encodedKeys
.
length
>
0
)
{
headers
.
set
(
'x-middleware-request-encoded'
,
encodedKeys
.
join
(
','
))
}
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment