ftdebugger
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Client.php
Lines changed: 5 additions & 2 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Client.php
Lines changed: 5 additions & 2 deletions
diff --git a/‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
Lines changed: 20 additions & 2 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
Lines changed: 20 additions & 2 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Request.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/HttpFoundation/Request.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
Lines changed: 7 additions & 0 deletions b/‎src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
Lines changed: 7 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Client.php
Lines changed: 17 additions & 2 deletions b/‎src/Symfony/Component/HttpKernel/Client.php
Lines changed: 17 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Routing/Router.php
Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Component/Routing/Router.php
Lines changed: 5 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Security/Http/AccessMap.php
Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Component/Security/Http/AccessMap.php
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php
Lines changed: 1 addition & 1 deletion
@@ -160,7 +160,7 @@ protected function getScript($request)
             $profilerCode = '$kernel->getContainer()->get(\'profiler\')->enable();';
         }
 
-        return <<<EOF
+        $code = <<<EOF
 <?php
 
 if ('$autoloader') {
@@ -171,7 +171,10 @@ protected function getScript($request)
 \$kernel = unserialize('$kernel');
 \$kernel->boot();
 $profilerCode
-echo serialize(\$kernel->handle(unserialize('$request')));
+
+\$request = unserialize('$request');
 EOF;
+
+        return $code.$this->getHandleScript();
     }
 }
@@ -5,7 +5,7 @@
         {% if collector.controller.class is defined %}
             {% set link = collector.controller.file|file_link(collector.controller.line) %}
             <span class="sf-toolbar-info-class sf-toolbar-info-with-next-pointer">{{ collector.controller.class|abbr_class }}</span>
-            <span class="sf-toolbar-info-method" onclick="{% if link %}window.location='{{link}}';window.event.stopPropagation();return false;{% endif %}">
+            <span class="sf-toolbar-info-method" onclick="{% if link %}window.location='{{link|e('js')}}';window.event.stopPropagation();return false;{% endif %}">
                 {{ collector.controller.method }}
             </span>
         {% else %}
 
@@ -117,7 +117,7 @@ private function isInlineableDefinition(ContainerBuilder $container, $id, Defini
             return true;
         }
 
-        if ($definition->isPublic()) {
+        if ($definition->isPublic() || $definition->isLazy()) {
             return false;
         }
 
 
@@ -12,10 +12,8 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use Symfony\Component\DependencyInjection\Scope;
-
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
-use Symfony\Component\DependencyInjection\Compiler\Compiler;
 use Symfony\Component\DependencyInjection\Compiler\RepeatedPass;
 use Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass;
 use Symfony\Component\DependencyInjection\Reference;
@@ -126,6 +124,26 @@ public function testProcessInlinesOnlyIfSameScope()
         $this->assertTrue($container->hasDefinition('a'));
     }
 
+    public function testProcessDoesNotInlineWhenServiceIsPrivateButLazy()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('foo')
+            ->setPublic(false)
+            ->setLazy(true)
+        ;
+
+        $container
+            ->register('service')
+            ->setArguments(array($ref = new Reference('foo')))
+        ;
+
+        $this->process($container);
+
+        $arguments = $container->getDefinition('service')->getArguments();
+        $this->assertSame($ref, $arguments[0]);
+    }
+
     protected function process(ContainerBuilder $container)
     {
         $repeatedPass = new RepeatedPass(array(new AnalyzeServiceReferencesPass(), new InlineServiceDefinitionsPass()));
 
@@ -1091,7 +1091,7 @@ public function getQueryString()
     public function isSecure()
     {
         if (self::$trustedProxies && self::$trustedHeaders[self::HEADER_CLIENT_PROTO] && $proto = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_PROTO])) {
-            return in_array(strtolower($proto), array('https', 'on', '1'));
+            return in_array(strtolower(current(explode(',', $proto))), array('https', 'on', 'ssl', '1'));
         }
 
         return 'on' == strtolower($this->server->get('HTTPS')) || 1 == $this->server->get('HTTPS');
 
@@ -1442,6 +1442,13 @@ public function testTrustedProxies()
         $this->assertEquals(443, $request->getPort());
         $this->assertTrue($request->isSecure());
 
+        // check various X_FORWARDED_PROTO header values
+        $request->headers->set('X_FORWARDED_PROTO', 'ssl');
+        $this->assertTrue($request->isSecure());
+
+        $request->headers->set('X_FORWARDED_PROTO', 'https, http');
+        $this->assertTrue($request->isSecure());
+
         // custom header names
         Request::setTrustedHeaderName(Request::HEADER_CLIENT_IP, 'X_MY_FOR');
         Request::setTrustedHeaderName(Request::HEADER_CLIENT_HOST, 'X_MY_HOST');
 
@@ -104,7 +104,7 @@ protected function getScript($request)
         $requirePath = str_replace("'", "\\'", $r->getFileName());
         $symfonyPath = str_replace("'", "\\'", realpath(__DIR__.'/../../..'));
 
-        return <<<EOF
+        $code = <<<EOF
 <?php
 
 require_once '$requirePath';
@@ -114,7 +114,22 @@ protected function getScript($request)
 \$loader->register();
 
 \$kernel = unserialize('$kernel');
-echo serialize(\$kernel->handle(unserialize('$request')));
+\$request = unserialize('$request');
+EOF;
+
+        return $code.$this->getHandleScript();
+    }
+
+    protected function getHandleScript()
+    {
+        return <<<'EOF'
+$response = $kernel->handle($request);
+
+if ($kernel instanceof Symfony\Component\HttpKernel\TerminableInterface) {
+    $kernel->terminate($request, $response);
+}
+
+echo serialize($response);
 EOF;
     }
 
 
@@ -266,8 +266,13 @@ public function getGenerator()
         } else {
             $class = $this->options['generator_cache_class'];
             $cache = new ConfigCache($this->options['cache_dir'].'/'.$class.'.php', $this->options['debug']);
+<<<<<<< HEAD
             if (!$cache->isFresh($class)) {
                 $dumper = $this->getGeneratorDumperInstance();
+=======
+            if (!$cache->isFresh()) {
+                $dumper = new $this->options['generator_dumper_class']($this->getRouteCollection());
+>>>>>>> 2.3
 
                 $options = array(
                     'class'      => $class,
 
@@ -36,6 +36,9 @@ public function add(RequestMatcherInterface $requestMatcher, array $attributes =
         $this->map[] = array($requestMatcher, $attributes, $channel);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public function getPatterns(Request $request)
     {
         foreach ($this->map as $elements) {
 
@@ -64,7 +64,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
     {
         if ($failureUrl = $request->get($this->options['failure_path_parameter'], null, true)) {
              $this->options['failure_path'] = $failureUrl;
-         }
+        }
 
         if (null === $this->options['failure_path']) {
             $this->options['failure_path'] = $this->options['login_path'];