Skip to content

Commit 99db261

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: [HttpKernel] Add listener that checks when request has both Forwarded and X-Forwarded-For [HttpKernel] Move conflicting origin IPs handling to catch block [travis] Fix deps=low/high patching
2 parents 1fc59e8 + 132e4c2 commit 99db261

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Resources/config/web.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,9 @@
4646
<argument type="service" id="request_stack" />
4747
<tag name="kernel.event_subscriber" />
4848
</service>
49+
50+
<service id="validate_request_listener" class="Symfony\Component\HttpKernel\EventListener\ValidateRequestListener">
51+
<tag name="kernel.event_subscriber" />
52+
</service>
4953
</services>
5054
</container>

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"symfony/config": "~2.8",
2424
"symfony/event-dispatcher": "~2.8|~3.0.0",
2525
"symfony/finder": "~2.0,>=2.0.5|~3.0.0",
26-
"symfony/http-foundation": "~2.4.9|~2.5,>=2.5.4|~3.0.0",
27-
"symfony/http-kernel": "~2.8",
26+
"symfony/http-foundation": "~2.7",
27+
"symfony/http-kernel": "~2.7.15|~2.8.8",
2828
"symfony/polyfill-mbstring": "~1.0",
2929
"symfony/filesystem": "~2.3|~3.0.0",
3030
"symfony/routing": "~2.8|~3.0.0",

0 commit comments

Comments
 (0)