Skip to content

Commit

Permalink
Merge branch '2.8'
Browse files Browse the repository at this point in the history
* 2.8:
  removed usage of the deprecated StringUtils::equals() method
  Fix: Resolve tempdir symlink, not working on OSX
  fixed tests
  migrate session after remember me authentication
  prevent timing attacks in digest auth listener
  mitigate CSRF timing attack vulnerability
  fix potential timing attack issue
  [WebProfilerBundle] Added a top left border radius to the minified to…
  [Routing] Changing RouteCollectionBuilder::import() behavior to add to the builder
  [HttpKernel] Don't reset on shutdown but in FrameworkBundle/Test/KernelTestCase
  [Process] PhpExecutableFinder: add regression test
  • Loading branch information
fabpot committed Nov 23, 2015
2 parents b709e7d + 2c7b16c commit 21de8f7
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions Kernel.php
Expand Up @@ -23,7 +23,6 @@
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
use Symfony\Component\DependencyInjection\Loader\DirectoryLoader;
use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
use Symfony\Component\DependencyInjection\ResettableContainerInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Bundle\BundleInterface;
Expand Down Expand Up @@ -155,10 +154,6 @@ public function shutdown()
$bundle->setContainer(null);
}

if ($this->container instanceof ResettableContainerInterface) {
$this->container->reset();
}

$this->container = null;
}

Expand Down

0 comments on commit 21de8f7

Please sign in to comment.