diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index cd39e4984236..885752b89da6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -73,7 +73,7 @@ public function getConfigTreeBuilder()
$this->addFormSection($rootNode);
$this->addEsiSection($rootNode);
- $this->addProxySection($rootNode);
+ $this->addRouterProxySection($rootNode);
$this->addProfilerSection($rootNode);
$this->addRouterSection($rootNode);
$this->addSessionSection($rootNode);
@@ -115,12 +115,12 @@ private function addEsiSection(ArrayNodeDefinition $rootNode)
;
}
- private function addProxySection(ArrayNodeDefinition $rootNode)
+ private function addRouterProxySection(ArrayNodeDefinition $rootNode)
{
$rootNode
->children()
- ->arrayNode('proxy')
- ->info('proxy configuration')
+ ->arrayNode('router_proxy')
+ ->info('proxy configuration for the HTTP content renderer')
->canBeDisabled()
->children()
->scalarNode('path')->defaultValue('/_proxy')->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 0cd4afb37086..958c2ce35065 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -94,8 +94,8 @@ public function load(array $configs, ContainerBuilder $container)
$this->registerEsiConfiguration($config['esi'], $loader);
}
- if (isset($config['proxy'])) {
- $this->registerProxyConfiguration($config['proxy'], $container, $loader);
+ if (isset($config['router_proxy'])) {
+ $this->registerRouterProxyConfiguration($config['router_proxy'], $container, $loader);
}
if (isset($config['profiler'])) {
@@ -189,12 +189,12 @@ private function registerEsiConfiguration(array $config, XmlFileLoader $loader)
}
/**
- * Loads the proxy configuration.
+ * Loads the router proxy configuration.
*
* @param array $config A proxy configuration array
* @param XmlFileLoader $loader An XmlFileLoader instance
*/
- private function registerProxyConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
+ private function registerRouterProxyConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
{
if (!empty($config['enabled'])) {
$loader->load('proxy.xml');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
index 91105d89822a..14dcf9f8a59b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -12,7 +12,7 @@
-
+
@@ -45,7 +45,7 @@
-
+