summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2011-07-23 22:07:22 +0000
committerStanislav Malyshev <stas@php.net>2011-07-23 22:07:22 +0000
commit7bb8f9eecb813f18e310fb49ad19f65b39a7780c (patch)
tree2987121fe992de6d4ed422507bfccbc99edef78a /Zend
parent48870107dcf08978a033e318dbab0f79564c5d77 (diff)
downloadphp-git-7bb8f9eecb813f18e310fb49ad19f65b39a7780c.tar.gz
Change E_ALL to include E_STRICT
Diffstat (limited to 'Zend')
-rw-r--r--Zend/zend_builtin_functions.c2
-rw-r--r--Zend/zend_errors.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 6f82776391..a81e9a8283 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -1501,7 +1501,7 @@ ZEND_FUNCTION(set_error_handler)
zval *error_handler;
zend_bool had_orig_error_handler=0;
char *error_handler_name = NULL;
- long error_type = E_ALL | E_STRICT;
+ long error_type = E_ALL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|l", &error_handler, &error_type) == FAILURE) {
return;
diff --git a/Zend/zend_errors.h b/Zend/zend_errors.h
index 03cdd8d9f8..1e5f218c30 100644
--- a/Zend/zend_errors.h
+++ b/Zend/zend_errors.h
@@ -38,7 +38,7 @@
#define E_DEPRECATED (1<<13L)
#define E_USER_DEPRECATED (1<<14L)
-#define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_RECOVERABLE_ERROR | E_DEPRECATED | E_USER_DEPRECATED)
+#define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_RECOVERABLE_ERROR | E_DEPRECATED | E_USER_DEPRECATED | E_STRICT)
#define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
#endif /* ZEND_ERRORS_H */