renamed proxy setting to trust_proxy_headers
This commit is contained in:
parent
e943fde2ef
commit
722ad12a2d
@ -18,7 +18,7 @@ RC4 to RC5
|
|||||||
following configuration:
|
following configuration:
|
||||||
|
|
||||||
framework:
|
framework:
|
||||||
proxy: true
|
trust_proxy_headers: true
|
||||||
|
|
||||||
* To avoid hidden naming collisions, the AbstractType does not try to define
|
* To avoid hidden naming collisions, the AbstractType does not try to define
|
||||||
the name of form types magically. You now need to implement the `getName()`
|
the name of form types magically. You now need to implement the `getName()`
|
||||||
|
@ -47,7 +47,7 @@ class Configuration implements ConfigurationInterface
|
|||||||
$rootNode
|
$rootNode
|
||||||
->children()
|
->children()
|
||||||
->scalarNode('charset')->end()
|
->scalarNode('charset')->end()
|
||||||
->scalarNode('proxy')->defaultFalse()->end()
|
->scalarNode('trust_proxy_headers')->defaultFalse()->end()
|
||||||
->scalarNode('secret')->isRequired()->end()
|
->scalarNode('secret')->isRequired()->end()
|
||||||
->scalarNode('exception_controller')->defaultValue('Symfony\\Bundle\\FrameworkBundle\\Controller\\ExceptionController::showAction')->end()
|
->scalarNode('exception_controller')->defaultValue('Symfony\\Bundle\\FrameworkBundle\\Controller\\ExceptionController::showAction')->end()
|
||||||
->scalarNode('ide')->defaultNull()->end()
|
->scalarNode('ide')->defaultNull()->end()
|
||||||
|
@ -66,7 +66,7 @@ class FrameworkExtension extends Extension
|
|||||||
$container->setParameter('kernel.secret', $config['secret']);
|
$container->setParameter('kernel.secret', $config['secret']);
|
||||||
$container->setParameter('exception_listener.controller', $config['exception_controller']);
|
$container->setParameter('exception_listener.controller', $config['exception_controller']);
|
||||||
|
|
||||||
$container->setParameter('kernel.proxy', $config['proxy']);
|
$container->setParameter('kernel.trust_proxy_headers', $config['trust_proxy_headers']);
|
||||||
|
|
||||||
if (!empty($config['test'])) {
|
if (!empty($config['test'])) {
|
||||||
$loader->load('test.xml');
|
$loader->load('test.xml');
|
||||||
|
@ -37,7 +37,7 @@ class FrameworkBundle extends Bundle
|
|||||||
{
|
{
|
||||||
public function boot()
|
public function boot()
|
||||||
{
|
{
|
||||||
if ($this->container->getParameter('kernel.proxy')) {
|
if ($this->container->getParameter('kernel.trust_proxy_headers')) {
|
||||||
Request::trustProxyData();
|
Request::trustProxyData();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user