Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4

diff --cc Zend/zend_builtin_functions.c
index f8d467478c7f53eb96fd520765b0f333a5824f28,8d39a31ad0cd1a31053f67bd2999dd6f11d906b2..eab98ed944e77b39701ad8abdf0df4400cca207f
--- 1/Zend/zend_builtin_functions.c
--- 2/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@@ -1512,8 -1413,9 +1512,9 @@@ ZEND_FUNCTION(trigger_error
  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;