summaryrefslogtreecommitdiff
path: root/Zend/zend_globals.h
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2008-03-08 21:54:03 +0000
committerFelipe Pena <felipe@php.net>2008-03-08 21:54:03 +0000
commitfd0d44f0a78bf528cc780b1fd5036e390de19a22 (patch)
tree0c97f29c12921b933075b398e2ae3dc268570d71 /Zend/zend_globals.h
parent2801e87a553bc92a3bec4aa32de56e8e6644ce70 (diff)
downloadphp-git-fd0d44f0a78bf528cc780b1fd5036e390de19a22.tar.gz
User error handlers no longer catch supressed errors (patch by Etienne Kneuss)
Diffstat (limited to 'Zend/zend_globals.h')
-rw-r--r--Zend/zend_globals.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index 25f248266b..9293715d78 100644
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -218,11 +218,15 @@ struct _zend_executor_globals {
int user_error_handler_error_reporting;
zval *user_error_handler;
+ zval *user_error_handler_old;
zval *user_exception_handler;
zend_stack user_error_handlers_error_reporting;
zend_ptr_stack user_error_handlers;
zend_ptr_stack user_exception_handlers;
+ zend_error_handling_t error_handling;
+ zend_class_entry *exception_class;
+
/* timeout support */
int timeout_seconds;