From: Xinchen Hui <laruence@gmail.com>
Date: Sat, 24 Mar 2012 07:15:27 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4
X-Git-Tag: php-5.4.1RC1~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ffc442927346077165e008ab8a33e1dfe0e6ea3;p=php

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

7ffc442927346077165e008ab8a33e1dfe0e6ea3
diff --cc Zend/zend_builtin_functions.c
index 29f9ed36bb,c4a10fde37..f8d467478c
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@@ -1512,9 -1413,8 +1512,8 @@@ 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;