From: Aaron Piotrowski <aaron@trowski.com>
Date: Fri, 3 Jul 2015 21:47:16 +0000 (-0500)
Subject: Remove E_EXCEPTION
X-Git-Tag: php-7.1.0alpha3~25^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fbcc82395269df8d4c862ad8eaede89beb1eb4bb;p=php

Remove E_EXCEPTION
---

diff --git a/Zend/zend_errors.h b/Zend/zend_errors.h
index 95be1aa2fb..25bb68de7a 100644
--- 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
index 4142ed9915..0216de39f2 100644
--- 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;
 	}