cvs: php-src /main main.c
| From: | Marcus Boerger | Date: | Thu, 11 May 2006 07:55:48 +0000 |
| Subject: | cvs: php-src /main main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-38154@lists.php.net to get a copy of this message | ||
helly Thu May 11 07:55:48 2006 UTC
Modified files:
/php-src/main main.c
Log:
- Fix error mode handling
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.686&r2=1.687&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.686 php-src/main/main.c:1.687
--- php-src/main/main.c:1.686 Wed Apr 12 12:52:00 2006
+++ php-src/main/main.c Thu May 11 07:55:48 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.686 2006/04/12 12:52:00 tony2001 Exp $ */
+/* $Id: main.c,v 1.687 2006/05/11 07:55:48 helly Exp $ */
/* {{{ includes
*/
@@ -796,8 +796,10 @@
/* according to error handling mode, suppress error, throw exception or show it */
if (PG(error_handling) != EH_NORMAL) {
switch (type) {
+ case E_ERROR:
case E_CORE_ERROR:
case E_COMPILE_ERROR:
+ case E_USER_ERROR:
case E_PARSE:
/* fatal errors are real errors and cannot be made exceptions */
break;