cvs: php-src(PHP_5_2) /main main.c ZendEngine2 zend.c zend_constants.c
| From: | Antony Dovgal | Date: | Wed, 10 May 2006 14:04:18 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /main main.c ZendEngine2 zend.c zend_constants.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-38130@lists.php.net to get a copy of this message | ||
tony2001 Wed May 10 14:04:18 2006 UTC
Modified files: (Branch: PHP_5_2)
/ZendEngine2 zend.c zend_constants.c
/php-src/main main.c
Log:
add missing parts of E_RECOVERABLE merge
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend.c?r1=1.308.2.12.2.1&r2=1.308.2.12.2.2&diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.308.2.12.2.1 ZendEngine2/zend.c:1.308.2.12.2.2
--- ZendEngine2/zend.c:1.308.2.12.2.1 Tue May 9 23:53:22 2006
+++ ZendEngine2/zend.c Wed May 10 14:04:18 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend.c,v 1.308.2.12.2.1 2006/05/09 23:53:22 helly Exp $ */
+/* $Id: zend.c,v 1.308.2.12.2.2 2006/05/10 14:04:18 tony2001 Exp $ */
#include "zend.h"
#include "zend_extensions.h"
@@ -923,6 +923,7 @@
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);
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_constants.c?r1=1.71.2.5&r2=1.71.2.5.2.1&diff_format=u
Index: ZendEngine2/zend_constants.c
diff -u ZendEngine2/zend_constants.c:1.71.2.5 ZendEngine2/zend_constants.c:1.71.2.5.2.1
--- ZendEngine2/zend_constants.c:1.71.2.5 Wed Mar 15 14:12:26 2006
+++ ZendEngine2/zend_constants.c Wed May 10 14:04:18 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_constants.c,v 1.71.2.5 2006/03/15 14:12:26 dmitry Exp $ */
+/* $Id: zend_constants.c,v 1.71.2.5.2.1 2006/05/10 14:04:18 tony2001 Exp $ */
#include "zend.h"
#include "zend_constants.h"
@@ -96,6 +96,7 @@
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);
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.640.2.23&r2=1.640.2.23.2.1&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23 php-src/main/main.c:1.640.2.23.2.1
--- php-src/main/main.c:1.640.2.23 Wed Apr 12 12:49:39 2006
+++ php-src/main/main.c Wed May 10 14:04:18 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.23 2006/04/12 12:49:39 tony2001 Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.1 2006/05/10 14:04:18 tony2001 Exp $ */
/* {{{ includes
*/
@@ -725,6 +725,9 @@
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 @@
}
/* 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: