symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+9-1Lines changed: 9 additions & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+9-1Lines changed: 9 additions & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+3Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
+4-2Lines changed: 4 additions & 2 deletions b/‎src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
+4-2Lines changed: 4 additions & 2 deletions
@@ -47,7 +47,15 @@ public function getConfigTreeBuilder()
         $rootNode
             ->children()
                 ->scalarNode('charset')->end()
-                ->scalarNode('trust_proxy_headers')->defaultFalse()->end()
+                ->arrayNode('trusted_proxies')
+                    ->prototype('scalar')
+                        ->validate()
+                            ->ifTrue(function($v) { return !filter_var($v, FILTER_VALIDATE_IP); })
+                            ->thenInvalid('Invalid proxy IP "%s"')
+                        ->end()
+                    ->end()
+                ->end()
+                ->scalarNode('trust_proxy_headers')->defaultFalse()->end() // @deprecated, to be removed in 2.3
                 ->scalarNode('secret')->isRequired()->end()
                 ->scalarNode('ide')->defaultNull()->end()
                 ->booleanNode('test')->end()
 
@@ -62,6 +62,9 @@ public function load(array $configs, ContainerBuilder $container)
         }
         $container->setParameter('kernel.secret', $config['secret']);
 
+        $container->setParameter('kernel.trusted_proxies', $config['trusted_proxies']);
+
+        // @deprecated, to be removed in 2.3
         $container->setParameter('kernel.trust_proxy_headers', $config['trust_proxy_headers']);
 
         if (!empty($config['test'])) {
 
@@ -37,8 +37,10 @@ class FrameworkBundle extends Bundle
 {
     public function boot()
     {
-        if ($this->container->getParameter('kernel.trust_proxy_headers')) {
-            Request::trustProxyData();
+        if ($trustedProxies = $this->container->getParameter('kernel.trusted_proxies')) {
+            Request::setTrustedProxies($trustedProxies);
+        } elseif ($this->container->getParameter('kernel.trust_proxy_headers')) {
+            Request::trustProxyData(); // @deprecated, to be removed in 2.3
         }
     }
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,9 @@ public function load(array $configs, ContainerBuilder $container)`
`62`	`62`	`}`
`63`	`63`	`$container->setParameter('kernel.secret', $config['secret']);`
`64`	`64`
	`65`	`+ $container->setParameter('kernel.trusted_proxies', $config['trusted_proxies']);`
	`66`	`+`
	`67`	`+ // @deprecated, to be removed in 2.3`
`65`	`68`	`$container->setParameter('kernel.trust_proxy_headers', $config['trust_proxy_headers']);`
`66`	`69`
`67`	`70`	`if (!empty($config['test'])) {`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,10 @@ class FrameworkBundle extends Bundle`
`37`	`37`	`{`
`38`	`38`	`public function boot()`
`39`	`39`	`{`
`40`		`- if ($this->container->getParameter('kernel.trust_proxy_headers')) {`
`41`		`- Request::trustProxyData();`
	`40`	`+ if ($trustedProxies = $this->container->getParameter('kernel.trusted_proxies')) {`
	`41`	`+ Request::setTrustedProxies($trustedProxies);`
	`42`	`+ } elseif ($this->container->getParameter('kernel.trust_proxy_headers')) {`
	`43`	`+ Request::trustProxyData(); // @deprecated, to be removed in 2.3`
`42`	`44`	`}`
`43`	`45`	`}`
`44`	`46`