diff options
author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-06-19 13:49:07 +0200 |
---|---|---|
committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-06-19 13:49:07 +0200 |
commit | ca60a32c601fe9b0236d3d4717c7b94368a3c172 (patch) | |
tree | 882756690ee8e446f7fc9e3ba14313151eddf423 /zend/origexception.h | |
parent | c6c68cbc60711b43e8a570d708db3768240fcc5a (diff) |
errors are no longer thrown as exceptions, but are php fatal errors, so that they more closely match the zend error reporting system
Diffstat (limited to 'zend/origexception.h')
-rw-r--r-- | zend/origexception.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/zend/origexception.h b/zend/origexception.h index 775e412..55f89cf 100644 --- a/zend/origexception.h +++ b/zend/origexception.h @@ -127,10 +127,12 @@ inline void process(Exception &exception TSRMLS_DC) // the exception is native, call the zend throw method zend_throw_exception(zend_exception_get_default(TSRMLS_C), (char *)exception.what(), 0 TSRMLS_CC); } - else + + // or does it have its own report function? + else if (!exception.report()) { // this is not a native exception, so it was originally thrown by a - // php script, and then not caught by the c++ of the extensiont, we are + // php script, and then not caught by the c++ of the extension, we are // going to tell to the exception that it is still active OrigException &orig = static_cast<OrigException&>(exception); |