add missing parts of E_RECOVERABLE merge

diff --git a/Zend/zend.c b/Zend/zend.c
index 66628e182bc25fc1572b9ddc79915f04349391b3..669a9becf8231d8e95e98534a979d12c3a1b925f 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -923,6 +923,7 @@ ZEND_API void zend_error(int type, const char *format, ...)
                case E_USER_ERROR:
                case E_USER_WARNING:
                case E_USER_NOTICE:
+               case E_RECOVERABLE_ERROR:
                        if (zend_is_compiling(TSRMLS_C)) {
                                error_filename = zend_get_compiled_filename(TSRMLS_C);
                                error_lineno = zend_get_compiled_lineno(TSRMLS_C);

diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
index bc678e2e719e14553f22b493fcd371562825d923..ec3e1e587a6f9d866c115b66279ff57ba532da8c 100644 (file)
--- a/Zend/zend_constants.c
+++ b/Zend/zend_constants.c
@@ -96,6 +96,7 @@ int zend_startup_constants(TSRMLS_D)
 void zend_register_standard_constants(TSRMLS_D)
 {
        REGISTER_MAIN_LONG_CONSTANT("E_ERROR", E_ERROR, CONST_PERSISTENT | CONST_CS);
+       REGISTER_MAIN_LONG_CONSTANT("E_RECOVERABLE_ERROR", E_RECOVERABLE_ERROR, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_LONG_CONSTANT("E_WARNING", E_WARNING, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_LONG_CONSTANT("E_PARSE", E_PARSE, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_LONG_CONSTANT("E_NOTICE", E_NOTICE, CONST_PERSISTENT | CONST_CS);

diff --git a/main/main.c b/main/main.c
index 1bf2996b53ae73228c4929bdc5ff972912106f04..732049f0d76323e9dfebae9e21e93e9f19183239 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -725,6 +725,9 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
                        case E_USER_ERROR:
                                error_type_str = "Fatal error";
                                break;
+                       case E_RECOVERABLE_ERROR:
+                               error_type_str = "Catchable fatal error";
+                               break;
                        case E_WARNING:
                        case E_CORE_WARNING:
                        case E_COMPILE_WARNING:
@@ -814,6 +817,7 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
                        }
                /* no break - intentionally */
                case E_ERROR:
+               case E_RECOVERABLE_ERROR:
                /* case E_PARSE: the parser would return 1 (failure), we can bail out nicely */
                case E_COMPILE_ERROR:
                case E_USER_ERROR: