Skip to content

Commit 4b5f608

Browse files
committed
Merge branch '2.8' into 3.2
* 2.8: (40 commits) Show exception is checked twice in ExceptionController of twig allow SSI fragments configuration in XML files Display a better error message when the toolbar cannot be displayed render hidden _method field in form_rest() return fallback locales whenever possible [Console] Fix catching exception type in QuestionHelper [WebProfilerBundle] Eliminate line wrap on count columnt (routing) [Routing] Fix XmlFileLoader exception message [Translation] Fix FileLoader::loadResource() php doc Sessions: configurable "use_strict_mode" option for NativeSessionStorage [FrameworkBundle] [Command] Clean bundle directory, fixes #23177 Reset redirectCount when throwing exception [TwigBundle] Remove template.xml services when templating is disabled add content-type header on exception response Embedding a response that combines expiration and validation, that should not defeat expiration on the combined response Fix two edge cases in ResponseCacheStrategy [Routing] Expose request in route conditions, if needed and possible [Routing] Expose request in route conditions, if needed and possible [Translation][FrameworkBundle] Fix resource loading order inconsistency reported in #23034 [Filesystem] added workaround in Filesystem::rename for PHP bug ...
2 parents 9fab1ab + 9ecb8c2 commit 4b5f608

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

Client.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,7 @@ public function followRedirect()
468468

469469
if (-1 !== $this->maxRedirects) {
470470
if ($this->redirectCount > $this->maxRedirects) {
471+
$this->redirectCount = 0;
471472
throw new \LogicException(sprintf('The maximum number (%d) of redirections was reached.', $this->maxRedirects));
472473
}
473474
}

0 commit comments

Comments
 (0)