php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-06 16:07:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:yiisoft/yii2 into internals-fix

Browse Source
This commit is contained in:
Nobuo Kihara
2015-05-09 10:29:27 +09:00
parent be514f30ec 8f1811919f
commit 2e41e892ea
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
framework/base/ErrorHandler.php
View File

@ -87,6 +87,12 @@ abstract class ErrorHandler extends Component
// disable error capturing to avoid recursive errors while handling exceptions // disable error capturing to avoid recursive errors while handling exceptions
$this->unregister(); $this->unregister();
// set preventive HTTP status code to 500 in case error handling somehow fails and headers are sent
// HTTP exceptions will override this value in renderException()
if (PHP_SAPI !== 'cli') {
http_response_code(500);
}
try { try {
$this->logException($exception); $this->logException($exception);
if ($this->discardExistingOutput) { if ($this->discardExistingOutput) {
@ -98,7 +104,8 @@ abstract class ErrorHandler extends Component
} }
} catch (\Exception $e) { } catch (\Exception $e) {
// an other exception could be thrown while displaying the exception // an other exception could be thrown while displaying the exception
$msg = (string) $e; $msg = "An Error occurred while handling another error:\n";
$msg .= (string) $e;
$msg .= "\nPrevious exception:\n"; $msg .= "\nPrevious exception:\n";
$msg .= (string) $exception; $msg .= (string) $exception;
if (YII_DEBUG) { if (YII_DEBUG) {
@ -112,10 +119,6 @@ abstract class ErrorHandler extends Component
} }
$msg .= "\n\$_SERVER = " . VarDumper::export($_SERVER); $msg .= "\n\$_SERVER = " . VarDumper::export($_SERVER);
error_log($msg); error_log($msg);
if (PHP_SAPI !== 'cli') {
http_response_code(500);
}
exit(1); exit(1);
} }