[xdebug-dev] xdebug xdebug/php_xdebug.h xdebug/xdebug.c xdebug/xdebug_handler_dbgp.c - Fixed bug #109: DBGP's eval will abort the script when the eval statement is

Date: Sun Mar 6 22:55:31 CET 2005
User: Derick Rethans
Directory: xdebug

Log Message:
[0.50]
- Fixed bug #109: DBGP's eval will abort the script when the eval statement is
  invalid.

Modified files:
           xdebug/php_xdebug.h (version: 1.88)
           xdebug/xdebug.c (version: 1.256)
           xdebug/xdebug_handler_dbgp.c (version: 1.72)

[FILE: /xdebug/php_xdebug.h]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- xdebug/php_xdebug.h:1.87 Sat Jan 08 13:21:01 2005 GMT
+++ xdebug/php_xdebug.h Sun Mar 06 20:55:31 2005 GMT
@@ -150,6 +150,7 @@
         /* remote debugging globals */
         zend_bool remote_enabled;
         zend_bool breakpoints_allowed;
+ zend_bool ignore_fatal_error;
         xdebug_con context;
         unsigned int breakpoint_count;
 

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- xdebug/xdebug.c:1.255 Tue Feb 01 22:33:15 2005 GMT
+++ xdebug/xdebug.c Sun Mar 06 20:55:31 2005 GMT
@@ -591,6 +591,7 @@
         XG(remote_enabled) = 0;
         XG(profiler_enabled) = 0;
         XG(breakpoints_allowed) = 1;
+ XG(ignore_fatal_error) = 0;
         if (XG(auto_trace) && XG(trace_output_dir) && strlen(XG(trace_output_dir))) {
                 /* In case we do an auto-trace we are not interested in the return
                  * value, but we still have to free it. */
@@ -1690,7 +1691,9 @@
                 /*case E_PARSE: the parser would return 1 (failure), we can bail out nicely */
                 case E_COMPILE_ERROR:
                 case E_USER_ERROR:
- zend_bailout();
+ if (!XG(ignore_fatal_error)) {
+ zend_bailout();
+ }
                         break;
         }
 }
@@ -2300,7 +2303,7 @@
         XDEBUG_VERSION,
         XDEBUG_AUTHOR,
         XDEBUG_URL,
- "Copyright (c) 2002, 2003, 2004",
+ "Copyright (c) 2002, 2003, 2004, 2005",
         xdebug_zend_startup,
         xdebug_zend_shutdown,
         NULL, /* activate_func_t */

[FILE: /xdebug/xdebug_handler_dbgp.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- xdebug/xdebug_handler_dbgp.c:1.71 Wed Feb 02 21:50:58 2005 GMT
+++ xdebug/xdebug_handler_dbgp.c Sun Mar 06 20:55:31 2005 GMT
@@ -1004,11 +1004,13 @@
 
         /* Do evaluation */
         XG(breakpoints_allowed) = 0;
+ XG(ignore_fatal_error) = 1;
         res = zend_eval_string(eval_string, ret_zval, "xdebug eval" TSRMLS_CC);
 
         /* Clean up */
         EG(error_reporting) = old_error_reporting;
         XG(breakpoints_allowed) = 1;
+ XG(ignore_fatal_error) = 0;
 
         return res;
 }
@@ -1888,7 +1890,7 @@
 
 char *xdebug_dbgp_get_revision(void)
 {
- return "$Revision: 1.71 $";
+ return "$Revision: 1.72 $";
 }
 
 int xdebug_dbgp_cmdloop(xdebug_con *context TSRMLS_DC)
Received on Sun Mar 06 2005 - 22:55:43 GMT