8000 minor #22177 [HttpKernel] Fix test (nicolas-grekas) · symfony/symfony@dd37126 · GitHub
[go: up one dir, main page]

Skip to content

Commit dd37126

Browse files
committed
minor #22177 [HttpKernel] Fix test (nicolas-grekas)
This PR was merged into the 2.7 branch. Discussion ---------- [HttpKernel] Fix test | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Should make 2.7 green again on Travis. Commits ------- ba8f46a [HttpKernel] Fix test
2 parents 46cf215 + ba8f46a commit dd37126

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/Symfony/Component/HttpKernel/Tests/EventListener/ValidateRequestListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function testListenerThrowsWhenMasterRequestHasInconsistentClientIps()
3232
$request = new Request();
3333
$request->setTrustedProxies(array('1.1.1.1'));
3434
$request->server->set('REMOTE_ADDR', '1.1.1.1');
35-
$request->headers->set('FORWARDED', '2.2.2.2');
35+
$request->headers->set('FORWARDED', 'for=2.2.2.2');
3636
$request->headers->set('X_FORWARDED_FOR', '3.3.3.3');
3737

3838
$dispatcher->addListener(KernelEvents::REQUEST, array(new ValidateRequestListener(), 'onKernelRequest'));

src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ public function testInconsistentClientIpsOnMasterRequests()
287287
$request = new Request();
288288
$request->setTrustedProxies(array('1.1.1.1'));
289289
$request->server->set('REMOTE_ADDR', '1.1.1.1');
290-
$request->headers->set('FORWARDED', '2.2.2.2');
290+
$request->headers->set('FORWARDED', 'for=2.2.2.2');
291291
$request->headers->set('X_FORWARDED_FOR', '3.3.3.3');
292292

293293
$kernel->handle($request, $kernel::MASTER_REQUEST, false);

0 commit comments

Comments
 (0)
0