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
92fd4b35
Commit
92fd4b35
authored
Jan 14, 2026
by
Jiachi Liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decode in one place for two modes
parent
a09167cb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
35 deletions
+37
-35
base-server.ts
packages/next/src/server/base-server.ts
+3
-17
resolve-routes.ts
packages/next/src/server/lib/router-utils/resolve-routes.ts
+6
-18
utils.ts
packages/next/src/server/web/utils.ts
+28
-0
No files found.
packages/next/src/server/base-server.ts
View file @
92fd4b35
...
@@ -111,7 +111,7 @@ import {
...
@@ -111,7 +111,7 @@ import {
import
{
BaseServerSpan
}
from
'./lib/trace/constants'
import
{
BaseServerSpan
}
from
'./lib/trace/constants'
import
{
I18NProvider
}
from
'./lib/i18n-provider'
import
{
I18NProvider
}
from
'./lib/i18n-provider'
import
{
sendResponse
}
from
'./send-response'
import
{
sendResponse
}
from
'./send-response'
import
{
normalizeNextQueryParam
}
from
'./web/utils'
import
{
normalizeNextQueryParam
,
decodeMiddlewareHeaders
}
from
'./web/utils'
import
{
import
{
HTML_CONTENT_TYPE_HEADER
,
HTML_CONTENT_TYPE_HEADER
,
JSON_CONTENT_TYPE_HEADER
,
JSON_CONTENT_TYPE_HEADER
,
...
@@ -943,23 +943,9 @@ export default abstract class Server<
...
@@ -943,23 +943,9 @@ export default abstract class Server<
isNodeNextResponse
(
res
)
?
res
.
originalResponse
:
res
isNodeNextResponse
(
res
)
?
res
.
originalResponse
:
res
)
)
//
In minimal mode (Vercel), d
ecode headers that were percent-encoded by middleware
//
D
ecode headers that were percent-encoded by middleware
// to preserve non-ASCII characters during transport.
// to preserve non-ASCII characters during transport.
if
(
this
.
minimalMode
)
{
decodeMiddlewareHeaders
(
req
.
headers
)
const
encodedHeaders
=
req
.
headers
[
'x-middleware-request-encoded'
]
if
(
typeof
encodedHeaders
===
'string'
)
{
for
(
const
key
of
encodedHeaders
.
split
(
','
))
{
const
headerKey
=
key
.
trim
()
const
value
=
req
.
headers
[
headerKey
]
if
(
typeof
value
===
'string'
&&
/%
[
0-9A-Fa-f
]{2}
/
.
test
(
value
))
{
try
{
req
.
headers
[
headerKey
]
=
decodeURIComponent
(
value
)
}
catch
{}
}
}
}
delete
req
.
headers
[
'x-middleware-request-encoded'
]
}
const
urlParts
=
(
req
.
url
||
''
).
split
(
'?'
,
1
)
const
urlParts
=
(
req
.
url
||
''
).
split
(
'?'
,
1
)
const
urlNoQuery
=
urlParts
[
0
]
const
urlNoQuery
=
urlParts
[
0
]
...
...
packages/next/src/server/lib/router-utils/resolve-routes.ts
View file @
92fd4b35
...
@@ -620,25 +620,13 @@ export function getResolveRoutes(
...
@@ -620,25 +620,13 @@ export function getResolveRoutes(
delete
middlewareHeaders
[
valueKey
]
delete
middlewareHeaders
[
valueKey
]
}
}
// Decode only headers that were explicitly marked as encoded.
// Copy the encoded headers marker to req.headers so base-server.ts
// This preserves intentional percent-encoding (like %2F, %20) in other headers.
// can decode them later (unified handling for local and minimal modes).
const
encodedHeaders
=
if
(
middlewareHeaders
[
'x-middleware-request-encoded'
])
{
middlewareHeaders
[
'x-middleware-request-encoded'
]
req
.
headers
[
'x-middleware-request-encoded'
]
=
if
(
typeof
encodedHeaders
===
'string'
)
{
middlewareHeaders
[
'x-middleware-request-encoded'
]
for
(
const
key
of
encodedHeaders
.
split
(
','
))
{
delete
middlewareHeaders
[
'x-middleware-request-encoded'
]
const
headerKey
=
key
.
trim
()
const
value
=
req
.
headers
[
headerKey
]
if
(
typeof
value
===
'string'
&&
/%
[
0-9A-Fa-f
]{2}
/
.
test
(
value
)
)
{
try
{
req
.
headers
[
headerKey
]
=
decodeURIComponent
(
value
)
}
catch
{}
}
}
}
}
delete
middlewareHeaders
[
'x-middleware-request-encoded'
]
}
}
if
(
if
(
...
...
packages/next/src/server/web/utils.ts
View file @
92fd4b35
...
@@ -218,3 +218,31 @@ export function decodeHeaderValue(value: string): string {
...
@@ -218,3 +218,31 @@ export function decodeHeaderValue(value: string): string {
}
}
return
value
return
value
}
}
/**
* Decodes middleware headers that were percent-encoded for safe HTTP transmission.
* Only decodes headers listed in 'x-middleware-request-encoded' marker.
* Deletes the marker after processing.
*
* @param headers - The headers object to decode (mutated in place)
*/
export
function
decodeMiddlewareHeaders
(
headers
:
Record
<
string
,
string
|
string
[]
|
undefined
>
):
void
{
const
encodedHeadersList
=
headers
[
'x-middleware-request-encoded'
]
if
(
typeof
encodedHeadersList
!==
'string'
)
{
return
}
for
(
const
key
of
encodedHeadersList
.
split
(
','
))
{
const
headerKey
=
key
.
trim
()
const
value
=
headers
[
headerKey
]
if
(
typeof
value
===
'string'
&&
/%
[
0-9A-Fa-f
]{2}
/
.
test
(
value
))
{
try
{
headers
[
headerKey
]
=
decodeURIComponent
(
value
)
}
catch
{}
}
}
delete
headers
[
'x-middleware-request-encoded'
]
}
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