Skip to content

Commit 1b7375f

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: Switched to non-null defaults in exception constructors Allow x-forwarded-prefix trusted header.
2 parents efa3522 + 6158eb7 commit 1b7375f

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function getConfigTreeBuilder()
9898
->enumPrototype()
9999
->values([
100100
'forwarded',
101-
'x-forwarded-for', 'x-forwarded-host', 'x-forwarded-proto', 'x-forwarded-port',
101+
'x-forwarded-for', 'x-forwarded-host', 'x-forwarded-proto', 'x-forwarded-port', 'x-forwarded-prefix',
102102
])
103103
->end()
104104
->end()

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2395,6 +2395,7 @@ private function resolveTrustedHeaders(array $headers): int
23952395
case 'x-forwarded-host': $trustedHeaders |= Request::HEADER_X_FORWARDED_HOST; break;
23962396
case 'x-forwarded-proto': $trustedHeaders |= Request::HEADER_X_FORWARDED_PROTO; break;
23972397
case 'x-forwarded-port': $trustedHeaders |= Request::HEADER_X_FORWARDED_PORT; break;
2398+
case 'x-forwarded-prefix': $trustedHeaders |= Request::HEADER_X_FORWARDED_PREFIX; break;
23982399
}
23992400
}
24002401

0 commit comments

Comments
 (0)