diff --git a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
index df8a3666cf8f8..3b32f4011260e 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
@@ -87,7 +87,7 @@ public function onKernelResponse(FilterResponseEvent $event)
return;
}
- if ($response->headers->has('X-Debug-Token') && $response->isRedirect() && $this->interceptRedirects) {
+ if ($response->headers->has('X-Debug-Token') && $response->isRedirect() && $this->interceptRedirects && 'html' === $request->getRequestFormat()) {
$session = $request->getSession();
if (null !== $session && $session->isStarted() && $session->getFlashBag() instanceof AutoExpireFlashBag) {
// keep current flashes for one more request if using AutoExpireFlashBag
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php
index a6ed9e8d7adc2..1260886f8df13 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php
@@ -58,7 +58,7 @@ public function getInjectToolbarTests()
/**
* @dataProvider provideRedirects
*/
- public function testRedirectionIsIntercepted($statusCode, $hasSession)
+ public function testHtmlRedirectionIsIntercepted($statusCode, $hasSession)
{
$response = new Response('Some content', $statusCode);
$response->headers->set('X-Debug-Token', 'xxxxxxxx');
@@ -71,6 +71,19 @@ public function testRedirectionIsIntercepted($statusCode, $hasSession)
$this->assertEquals('Redirection', $response->getContent());
}
+ public function testNonHtmlRedirectionIsNotIntercepted()
+ {
+ $response = new Response('Some content', '301');
+ $response->headers->set('X-Debug-Token', 'xxxxxxxx');
+ $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(false, 'json', true), HttpKernelInterface::MASTER_REQUEST, $response);
+
+ $listener = new WebDebugToolbarListener($this->getTwigMock('Redirection'), true);
+ $listener->onKernelResponse($event);
+
+ $this->assertEquals(301, $response->getStatusCode());
+ $this->assertEquals('Some content', $response->getContent());
+ }
+
public function testToolbarIsInjected()
{
$response = new Response('');
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy