Remove E_EXCEPTION

trowski · trowski · commit fbcc82395269 · 2015-07-03T17:53:42.000-05:00
diff --git a/Zend/zend_errors.h b/Zend/zend_errors.h
@@ -38,8 +38,6 @@
 #define E_DEPRECATED		(1<<13L)
 #define E_USER_DEPRECATED	(1<<14L)
 
-#define E_EXCEPTION			(1<<15L)
-
 #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)
 
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
@@ -2130,7 +2130,7 @@ static void soap_error_handler(int error_num, const char *error_filename, const
 	_old_http_response_code = SG(sapi_headers).http_response_code;
 	_old_http_status_line = SG(sapi_headers).http_status_line;
 
-	if (!SOAP_GLOBAL(use_soap_error_handler) || !EG(objects_store).object_buckets || (error_num & E_EXCEPTION)) {
+	if (!SOAP_GLOBAL(use_soap_error_handler) || !EG(objects_store).object_buckets) {
 		call_old_error_handler(error_num, error_filename, error_lineno, format, args);
 		return;
 	}

Original file line number	Diff line number	Diff line change
`@@ -2130,7 +2130,7 @@ static void soap_error_handler(int error_num, const char *error_filename, const`
`2130`	`2130`	`_old_http_response_code = SG(sapi_headers).http_response_code;`
`2131`	`2131`	`_old_http_status_line = SG(sapi_headers).http_status_line;`
`2132`	`2132`
`2133`		`- if (!SOAP_GLOBAL(use_soap_error_handler) \|\| !EG(objects_store).object_buckets \|\| (error_num & E_EXCEPTION)) {`
	`2133`	`+ if (!SOAP_GLOBAL(use_soap_error_handler) \|\| !EG(objects_store).object_buckets) {`
`2134`	`2134`	`call_old_error_handler(error_num, error_filename, error_lineno, format, args);`
`2135`	`2135`	`return;`
`2136`	`2136`	`}`