nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-23 02:14:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

We should error 500 when we have an exception that isn't caught.

Browse Source
This commit is contained in:
Andrew McMillan 2012-05-14 20:54:43 +12:00
parent 0c582b9147
commit 47363b4f41
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/always.php
View File

@ -18,7 +18,10 @@ unset($session); unset($request); unset($dbconn); unset($_awl_dbconn); unset($in
// An ultra-simple exception handler to catch errors that occur
// before we get a more functional exception handler in place...
function early_exception_handler($e) {
if ( !headers_sent() ) header("Content-type: text/plain"); else echo "<pre>\n";
if ( !headers_sent() ) {
header("Content-type: text/plain"); else echo "<pre>\n";
header( sprintf("HTTP/1.1 %d %s", 500, getStatusMessage(500)) );
}
while ( ob_get_level() > 0 ) ob_end_flush();
echo "Exception [".$e->getCode()."] ".$e->getmessage()."\n";
echo "At line ", $e->getLine(), " of ", $e->getFile(), "\n";
@ -28,6 +31,7 @@ function early_exception_handler($e) {
foreach( $trace AS $k => $v ) {
printf( "%s[%d] %s%s%s()\n", $v['file'], $v['line'], (isset($v['class'])?$v['class']:''), (isset($v['type'])?$v['type']:''), (isset($v['function'])?$v['function']:'') );
}
}
set_exception_handler('early_exception_handler');

6
inc/always.php.in
View File

@ -18,7 +18,10 @@ unset($session); unset($request); unset($dbconn); unset($_awl_dbconn); unset($in
// An ultra-simple exception handler to catch errors that occur
// before we get a more functional exception handler in place...
function early_exception_handler($e) {
if ( !headers_sent() ) header("Content-type: text/plain"); else echo "<pre>\n";
if ( !headers_sent() ) {
header("Content-type: text/plain"); else echo "<pre>\n";
header( sprintf("HTTP/1.1 %d %s", 500, getStatusMessage(500)) );
}
while ( ob_get_level() > 0 ) ob_end_flush();
echo "Exception [".$e->getCode()."] ".$e->getmessage()."\n";
echo "At line ", $e->getLine(), " of ", $e->getFile(), "\n";
@ -28,6 +31,7 @@ function early_exception_handler($e) {
foreach( $trace AS $k => $v ) {
printf( "%s[%d] %s%s%s()\n", $v['file'], $v['line'], (isset($v['class'])?$v['class']:''), (isset($v['type'])?$v['type']:''), (isset($v['function'])?$v['function']:'') );
}
}
set_exception_handler('early_exception_handler');