cvs: /php4 NEWS main.c php.ini-dist php.ini-optimized

zeev Wed Apr 19 08:10:44 2000 EDT Modified files: /php4 NEWS main.c php.ini-dist php.ini-optimized Log: Support E_USER_* error types Index: php4/NEWS diff -u php4/NEWS:1.205 php4/NEWS:1.206 --- php4/NEWS:1.205 Wed Apr 19 07:59:02 2000 +++ php4/NEWS Wed Apr 19 08:10:14 2000 @@ -2,6 +2,8 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2000, Version 4.0.0 Release +- Added user_error(), to allow explicitly generate error messages from scripts + (Zeev, Zend Engine) - Fixed long2ip() to return the correct IP address. (Evan) - Fix many memory leaks in the IMAP module (Stanislav, Andi, Zeev) - Fix bug in number_format (Jon Forsberg) Index: php4/main.c diff -u php4/main.c:1.235 php4/main.c:1.236 --- php4/main.c:1.235 Sat Apr 15 07:30:18 2000 +++ php4/main.c Wed Apr 19 08:10:14 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.235 2000/04/15 14:30:18 zeev Exp $ */ +/* $Id: main.c,v 1.236 2000/04/19 15:10:14 zeev Exp $ */ #include <stdio.h> @@ -321,6 +321,9 @@ case E_ERROR: case E_NOTICE: case E_WARNING: + case E_USER_ERROR: + case E_USER_WARNING: + case E_USER_NOTICE: if (zend_is_compiling()) { error_filename = zend_get_compiled_filename(CLS_C); error_lineno = zend_get_compiled_lineno(CLS_C); @@ -349,11 +352,13 @@ case E_ERROR: case E_CORE_ERROR: case E_COMPILE_ERROR: + case E_USER_ERROR: error_type_str = "Fatal error"; break; case E_WARNING: case E_CORE_WARNING: case E_COMPILE_WARNING: + case E_USER_WARNING: error_type_str = "Warning"; break; case E_PARSE: @@ -362,6 +367,9 @@ case E_NOTICE: error_type_str = "Warning"; break; + case E_USER_NOTICE: + error_type_str = "Notice"; + break; default: error_type_str = "Unknown error"; break; @@ -400,6 +408,7 @@ case E_CORE_ERROR: /*case E_PARSE: the parser would return 1 (failure), we can bail out nicely */ case E_COMPILE_ERROR: + case E_USER_ERROR: if (module_initialized) { zend_bailout(); return; Index: php4/php.ini-dist diff -u php4/php.ini-dist:1.31 php4/php.ini-dist:1.32 --- php4/php.ini-dist:1.31 Mon Mar 20 00:19:51 2000 +++ php4/php.ini-dist Wed Apr 19 08:10:14 2000 @@ -145,6 +145,9 @@ ; E_CORE_WARNING - warnings (non fatal errors) that occur during PHP's initial startup ; E_COMPILE_ERROR - fatal compile-time errors ; E_COMPILE_WARNING - compile-time warnings (non fatal errors) +; E_USER_ERROR - user-generated error message +; E_USER_WARNING - user-generated warning message +; E_USER_NOTICE - user-generated notice message ; Examples: ; error_reporting = E_ALL & ~E_NOTICE ; show all errors, except for notices ; error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR ; show only errors Index: php4/php.ini-optimized diff -u php4/php.ini-optimized:1.2 php4/php.ini-optimized:1.3 --- php4/php.ini-optimized:1.2 Fri Apr 7 12:55:05 2000 +++ php4/php.ini-optimized Wed Apr 19 08:10:14 2000 @@ -133,6 +133,9 @@ ; E_CORE_WARNING - warnings (non fatal errors) that occur during PHP's initial startup ; E_COMPILE_ERROR - fatal compile-time errors ; E_COMPILE_WARNING - compile-time warnings (non fatal errors) +; E_USER_ERROR - user-generated error message +; E_USER_WARNING - user-generated warning message +; E_USER_NOTICE - user-generated notice message ; Examples: ; error_reporting = E_ALL & ~E_NOTICE ; show all errors, except for notices ; error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR ; show only errors