adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5406 from cakephp/issue-5311

Browse source 
Handle exception when RequestHandler::startup() fails.

Refs #5311
This commit is contained in:
Mark Story 2014-12-14 18:05:35 -05:00
commit af8febf635
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/Cake/Error/ExceptionRenderer.php
View file

@ -153,9 +153,20 @@ class ExceptionRenderer {
try { try {
$controller = new CakeErrorController($request, $response); $controller = new CakeErrorController($request, $response);
$controller->startupProcess(); $controller->startupProcess();
$startup = true;
} catch (Exception $e) { } catch (Exception $e) {
if (!empty($controller) && $controller->Components->enabled('RequestHandler')) { $startup = false;
}
// Retry RequestHandler, as another aspect of startupProcess()
// could have failed. Ignore any exceptions out of startup, as
// there could be userland input data parsers.
if ($startup === false &&
!empty($controller) &&
$controller->Components->enabled('RequestHandler')
) {
try {
$controller->RequestHandler->startup($controller); $controller->RequestHandler->startup($controller);
} catch (Exception $e) {
} }
} }
} }