Skip to content

Commit 0bec5f1

Browse files
committed
Merge branch '2.8' into 3.0
* 2.8: [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 9b198b2 + 99db261 commit 0bec5f1

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

Resources/config/web.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,9 @@
3838
<argument type="service" id="request_stack" />
3939
<tag name="kernel.event_subscriber" />
4040
</service>
41+
42+
<service id="validate_request_listener" class="Symfony\Component\HttpKernel\EventListener\ValidateRequestListener">
43+
<tag name="kernel.event_subscriber" />
44+
</service>
4145
</services>
4246
</container>

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"symfony/config": "~2.8|~3.0",
2424
"symfony/event-dispatcher": "~2.8|~3.0",
2525
"symfony/http-foundation": "~2.8|~3.0",
26-
"symfony/http-kernel": "~2.8|~3.0",
26+
"symfony/http-kernel": "~2.8.8|~3.0.8|~3.1.2|~3.2",
2727
"symfony/polyfill-mbstring": "~1.0",
2828
"symfony/filesystem": "~2.8|~3.0",
2929
"symfony/finder": "~2.8|~3.0",

0 commit comments

Comments
 (0)