symfony
diff --git a/‎src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
Lines changed: 3 additions & 1 deletion b/‎src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
Lines changed: 3 additions & 1 deletion
diff --git a/‎src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
Lines changed: 4 additions & 2 deletions b/‎src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
Lines changed: 4 additions & 2 deletions
@@ -122,7 +122,9 @@ protected function createSubRequest($uri, Request $request)
             // Do nothing
         }
 
-        $server['REMOTE_ADDR'] = '127.0.0.1';
+        $trustedProxies = Request::getTrustedProxies();
+        $server['REMOTE_ADDR'] = $trustedProxies ? reset($trustedProxies) : '127.0.0.1';
+
         unset($server['HTTP_IF_MODIFIED_SINCE']);
         unset($server['HTTP_IF_NONE_MATCH']);
 
 
@@ -56,6 +56,7 @@ public function testRenderWithObjectsAsAttributes()
         $subRequest->attributes->replace(array('object' => $object, '_format' => 'html', '_controller' => 'main_controller', '_locale' => 'en'));
         $subRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
         $subRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
+        $subRequest->server->set('REMOTE_ADDR', '1.1.1.1');
 
         $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($subRequest));
 
@@ -84,7 +85,7 @@ public function testRenderWithTrustedHeaderDisabled()
     {
         Request::setTrustedHeaderName(Request::HEADER_CLIENT_IP, '');
 
-        $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest(Request::create('/')));
+        $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest(Request::create('/', 'GET', array(), array(), array(), array('REMOTE_ADDR' => '1.1.1.1'))));
         $this->assertSame('foo', $strategy->render('/', Request::create('/'))->getContent());
     }
 
@@ -168,6 +169,7 @@ public function testESIHeaderIsKeptInSubrequest()
     {
         $expectedSubRequest = Request::create('/');
         $expectedSubRequest->headers->set('Surrogate-Capability', 'abc="ESI/1.0"');
+        $expectedSubRequest->server->set('REMOTE_ADDR', '1.1.1.1');
 
         if (Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP)) {
             $expectedSubRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
@@ -193,7 +195,7 @@ public function testESIHeaderIsKeptInSubrequestWithTrustedHeaderDisabled()
 
     public function testHeadersPossiblyResultingIn304AreNotAssignedToSubrequest()
     {
-        $expectedSubRequest = Request::create('/');
+        $expectedSubRequest = Request::create('/', 'GET', array(), array(), array(), array('REMOTE_ADDR' => '1.1.1.1'));
         if (Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP)) {
             $expectedSubRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
             $expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,9 @@ protected function createSubRequest($uri, Request $request)`
`122`	`122`	`// Do nothing`
`123`	`123`	`}`
`124`	`124`
`125`		`- $server['REMOTE_ADDR'] = '127.0.0.1';`
	`125`	`+ $trustedProxies = Request::getTrustedProxies();`
	`126`	`+ $server['REMOTE_ADDR'] = $trustedProxies ? reset($trustedProxies) : '127.0.0.1';`
	`127`	`+`
`126`	`128`	`unset($server['HTTP_IF_MODIFIED_SINCE']);`
`127`	`129`	`unset($server['HTTP_IF_NONE_MATCH']);`
`128`	`130`