[xdebug-dev] xdebug xdebug/test.sh xdebug/xdebug.c - Fixed segfault with PHP 5.1, old_execute is now a symbol that is used in the

Date: Mon Nov 1 13:09:49 CET 2004
User: Derick Rethans
Directory: xdebug

Log Message:
[0.10]
- Fixed segfault with PHP 5.1, old_execute is now a symbol that is used in the
  Zend engine too.

Modified files:
           xdebug/test.sh (version: 1.16)
           xdebug/xdebug.c (version: 1.249)

[FILE: /xdebug/test.sh]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xdebug/test.sh:1.15 Fri Oct 29 08:01:17 2004 GMT
+++ xdebug/test.sh Mon Nov 01 11:09:49 2004 GMT
@@ -1 +1 @@
-TEST_PHP_EXECUTABLE=`which php-5.0dev` php-5.0dev -dxdebug.auto_trace=0 /dat/dev/php/php-5.0dev/run-tests.php tests/*.phpt
+TEST_PHP_EXECUTABLE=`which php-5.1dev` php-5.1dev -dxdebug.auto_trace=0 /dat/dev/php/php-5.1dev/run-tests.php tests/*.phpt

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- xdebug/xdebug.c:1.248 Mon Nov 01 11:06:17 2004 GMT
+++ xdebug/xdebug.c Mon Nov 01 11:09:49 2004 GMT
@@ -74,10 +74,10 @@
 zend_op_array* (*old_compile_file)(zend_file_handle* file_handle, int type TSRMLS_DC);
 zend_op_array* xdebug_compile_file(zend_file_handle*, int TSRMLS_DC);
 
-void (*old_execute)(zend_op_array *op_array TSRMLS_DC);
+void (*xdebug_old_execute)(zend_op_array *op_array TSRMLS_DC);
 void xdebug_execute(zend_op_array *op_array TSRMLS_DC);
 
-void (*old_execute_internal)(zend_execute_data *current_execute_data, int return_value_used TSRMLS_DC);
+void (*xdebug_old_execute_internal)(zend_execute_data *current_execute_data, int return_value_used TSRMLS_DC);
 void xdebug_execute_internal(zend_execute_data *current_execute_data, int return_value_used TSRMLS_DC);
 
 /* error callback repalcement functions */
@@ -442,10 +442,10 @@
         old_compile_file = zend_compile_file;
         zend_compile_file = xdebug_compile_file;
 
- old_execute = zend_execute;
+ xdebug_old_execute = zend_execute;
         zend_execute = xdebug_execute;
 
- old_execute_internal = zend_execute_internal;
+ xdebug_old_execute_internal = zend_execute_internal;
         zend_execute_internal = xdebug_execute_internal;
 
         /* Replace error handler callback with our own */
@@ -494,8 +494,8 @@
 {
         /* Reset compile, execute and error callbacks */
         zend_compile_file = old_compile_file;
- zend_execute = old_execute;
- zend_execute_internal = old_execute_internal;
+ zend_execute = xdebug_old_execute;
+ zend_execute_internal = xdebug_old_execute_internal;
         zend_error_cb = old_error_cb;
 
         return SUCCESS;
Received on Mon Nov 01 2004 - 13:09:55 GMT