diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

force the Content-Type to html in the web profiler controllers

Browse Source
This commit is contained in:
Lukas Kahwe Smith 2013-05-15 18:33:29 +02:00
parent 70ea5a61c5
commit 6d2135b65c
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php
View File

@ -50,7 +50,7 @@ class ExceptionController
if (!$this->twig->getLoader()->exists($template)) {
$handler = new ExceptionHandler();
return new Response($handler->getContent($exception));
return new Response($handler->getContent($exception), 200, array('Content-Type' => 'text/html'));
}
$code = $exception->getStatusCode();
@ -64,7 +64,7 @@ class ExceptionController
'logger' => null,
'currentContent' => '',
)
));
), 200, array('Content-Type' => 'text/html'));
}
/**
@ -87,7 +87,7 @@ class ExceptionController
return new Response($handler->getStylesheet($exception));
}
return new Response($this->twig->render('@WebProfiler/Collector/exception.css.twig'));
return new Response($this->twig->render('@WebProfiler/Collector/exception.css.twig'), 200, 'text/css');
}
protected function getTemplate()

32
src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
View File

@ -61,7 +61,7 @@ class ProfilerController
{
$this->profiler->disable();
return new RedirectResponse($this->generator->generate('_profiler_search_results', array('token' => 'empty', 'limit' => 10)));
return new RedirectResponse($this->generator->generate('_profiler_search_results', array('token' => 'empty', 'limit' => 10)), 302, array('Content-Type' => 'text/html'));
}
/**
@ -82,7 +82,7 @@ class ProfilerController
$page = $request->query->get('page', 'home');
if (!$profile = $this->profiler->loadProfile($token)) {
return new Response($this->twig->render('@WebProfiler/Profiler/info.html.twig', array('about' => 'no_token', 'token' => $token)));
return new Response($this->twig->render('@WebProfiler/Profiler/info.html.twig', array('about' => 'no_token', 'token' => $token)), 200, array('Content-Type' => 'text/html'));
}
if (!$profile->hasCollector($panel)) {
@ -98,7 +98,7 @@ class ProfilerController
'request' => $request,
'templates' => $this->getTemplateManager()->getTemplates($profile),
'is_ajax' => $request->isXmlHttpRequest(),
)));
)), 200, array('Content-Type' => 'text/html'));
}
/**
@ -134,7 +134,7 @@ class ProfilerController
$this->profiler->disable();
$this->profiler->purge();
return new RedirectResponse($this->generator->generate('_profiler_info', array('about' => 'purge')));
return new RedirectResponse($this->generator->generate('_profiler_info', array('about' => 'purge')), 302, array('Content-Type' => 'text/html'));
}
/**
@ -151,14 +151,14 @@ class ProfilerController
$file = $request->files->get('file');
if (empty($file) || !$file->isValid()) {
return new RedirectResponse($this->generator->generate('_profiler_info', array('about' => 'upload_error')));
return new RedirectResponse($this->generator->generate('_profiler_info', array('about' => 'upload_error')), 302, array('Content-Type' => 'text/html'));
}
if (!$profile = $this->profiler->import(file_get_contents($file->getPathname()))) {
return new RedirectResponse($this->generator->generate('_profiler_info', array('about' => 'already_exists')));
return new RedirectResponse($this->generator->generate('_profiler_info', array('about' => 'already_exists')), 302, array('Content-Type' => 'text/html'));
}
return new RedirectResponse($this->generator->generate('_profiler', array('token' => $profile->getToken())));
return new RedirectResponse($this->generator->generate('_profiler', array('token' => $profile->getToken())), 302, array('Content-Type' => 'text/html'));
}
/**
@ -174,7 +174,7 @@ class ProfilerController
return new Response($this->twig->render('@WebProfiler/Profiler/info.html.twig', array(
'about' => $about
)));
)), 200, array('Content-Type' => 'text/html'));
}
/**
@ -195,13 +195,13 @@ class ProfilerController
}
if (null === $token) {
return new Response();
return new Response('', 200, array('Content-Type' => 'text/html'));
}
$this->profiler->disable();
if (!$profile = $this->profiler->loadProfile($token)) {
return new Response();
return new Response('', 200, array('Content-Type' => 'text/html'));
}
// the toolbar position (top, bottom, normal, or null -- use the configuration)
@ -222,7 +222,7 @@ class ProfilerController
'templates' => $this->getTemplateManager()->getTemplates($profile),
'profiler_url' => $url,
'token' => $token,
)));
)), 200, array('Content-Type' => 'text/html'));
}
/**
@ -262,7 +262,7 @@ class ProfilerController
'start' => $start,
'end' => $end,
'limit' => $limit,
)));
)), 200, array('Content-Type' => 'text/html'));
}
/**
@ -297,7 +297,7 @@ class ProfilerController
'end' => $end,
'limit' => $limit,
'panel' => null,
)));
)), 200, array('Content-Type' => 'text/html'));
}
/**
@ -330,7 +330,7 @@ class ProfilerController
}
if (!empty($token)) {
return new RedirectResponse($this->generator->generate('_profiler', array('token' => $token)));
return new RedirectResponse($this->generator->generate('_profiler', array('token' => $token)), 302, array('Content-Type' => 'text/html'));
}
$tokens = $this->profiler->find($ip, $url, $limit, $method, $start, $end);
@ -343,7 +343,7 @@ class ProfilerController
'start' => $start,
'end' => $end,
'limit' => $limit,
)));
)), 302, array('Content-Type' => 'text/html'));
}
/**
@ -359,7 +359,7 @@ class ProfilerController
phpinfo();
$phpinfo = ob_get_clean();
return new Response($phpinfo);
return new Response($phpinfo, 200, array('Content-Type' => 'text/html'));
}
/**

4
src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php
View File

@ -53,7 +53,7 @@ class RouterController
$this->profiler->disable();
if (null === $this->matcher || null === $this->routes) {
return new Response('The Router is not enabled.');
return new Response('The Router is not enabled.', 200, array('Content-Type' => 'text/html'));
}
$profile = $this->profiler->loadProfile($token);
@ -68,6 +68,6 @@ class RouterController
'request' => $request,
'router' => $profile->getCollector('router'),
'traces' => $matcher->getTraces($request->getPathInfo()),
)));
)), 200, array('Content-Type' => 'text/html'));
}
}