bug #23199 Reset redirectCount when throwing exception (hvanoch)

fabpot · fabpot · commit b8c94d03c2a6 · 2017-06-15T07:57:21.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- Reset redirectCount when throwing exception | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #23197 | License | MIT When catching the exception throw when exceeding the redirect limit, all new request which results in a redirect fail. By resetting the redirectCount we can still use the same client instance. Commits ------- 83fd578 Reset redirectCount when throwing exception
diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
@@ -448,6 +448,7 @@ public function followRedirect()
 
         if (-1 !== $this->maxRedirects) {
             if ($this->redirectCount > $this->maxRedirects) {
+                $this->redirectCount = 0;
                 throw new \LogicException(sprintf('The maximum number (%d) of redirections was reached.', $this->maxRedirects));
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -448,6 +448,7 @@ public function followRedirect()`
`448`	`448`
`449`	`449`	`if (-1 !== $this->maxRedirects) {`
`450`	`450`	`if ($this->redirectCount > $this->maxRedirects) {`
	`451`	`+ $this->redirectCount = 0;`
`451`	`452`	`throw new \LogicException(sprintf('The maximum number (%d) of redirections was reached.', $this->maxRedirects));`
`452`	`453`	`}`
`453`	`454`	`}`