summaryrefslogtreecommitdiffstats
path: root/Http
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2016-11-23 16:46:43 -0800
committerFabien Potencier <fabien.potencier@gmail.com>2016-11-23 16:46:43 -0800
commite525e2da21da2e413caa41f41e71df22820c0047 (patch)
tree5c0d93fe9a323e41d0651f48e14502ef471dc82f /Http
parent6772b16c4980130885eff18f4a1c043a5d3f6554 (diff)
parent7d56da2b5b09a909d1e38a7f19d2fb3f73945b42 (diff)
downloadsymfony-security-e525e2da21da2e413caa41f41e71df22820c0047.zip
symfony-security-e525e2da21da2e413caa41f41e71df22820c0047.tar.gz
symfony-security-e525e2da21da2e413caa41f41e71df22820c0047.tar.bz2
Merge branch '3.1' into 3.2
* 3.1: [Filesystem] Remove extra argv in dumpFile() tests [DI] minor FileLoaders tests update [HttpKernel] Revert BC breaking change of Request::isMethodSafe() [DOMCrawler] Bug fixed [FrameworkBundle] Mark cache.default_*_provider services private [Process] Do feat test before enabling TTY mode bumped Symfony version to 3.1.8 updated VERSION for 3.1.7 updated CHANGELOG for 3.1.7 bumped Symfony version to 2.8.15 updated VERSION for 2.8.14 updated CHANGELOG for 2.8.14 bumped Symfony version to 2.7.22 updated VERSION for 2.7.21 update CONTRIBUTORS for 2.7.21 updated CHANGELOG for 2.7.21 Fix annotation type for $context [Doctrine][Form] support large integers
Diffstat (limited to 'Http')
-rw-r--r--Http/Firewall/ExceptionListener.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/Firewall/ExceptionListener.php b/Http/Firewall/ExceptionListener.php
index 98f5ac0..3c9604e 100644
--- a/Http/Firewall/ExceptionListener.php
+++ b/Http/Firewall/ExceptionListener.php
@@ -220,7 +220,7 @@ class ExceptionListener
protected function setTargetPath(Request $request)
{
// session isn't required when using HTTP basic authentication mechanism for example
- if ($request->hasSession() && $request->isMethodSafe() && !$request->isXmlHttpRequest()) {
+ if ($request->hasSession() && $request->isMethodSafe(false) && !$request->isXmlHttpRequest()) {
$this->saveTargetPath($request->getSession(), $this->providerKey, $request->getUri());
}
}