[xdebug-dev] xdebug xdebug/xdebug.c xdebug/tests/bug00032-ze1.phpt xdebug/tests/bug00057-ze1.phpt xdebug/tests/test10.phpt xdebug/tests/test20.phpt xdebug/tests/test7.phpt xdebug/tests/test9.phpt - Fixed some test cases.

Date: Mon Aug 15 09:30:42 CEST 2005
User: Derick Rethans
Directory: xdebug

Log Message:
- Fixed compilation with PHP 5.0.x
- Fixed some test cases.

Modified files:
           xdebug/xdebug.c (version: 1.271)
           xdebug/tests/bug00032-ze1.phpt (version: 1.3)
           xdebug/tests/bug00057-ze1.phpt (version: 1.3)
           xdebug/tests/test10.phpt (version: 1.9)
           xdebug/tests/test20.phpt (version: 1.8)
           xdebug/tests/test7.phpt (version: 1.8)
           xdebug/tests/test9.phpt (version: 1.9)

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- xdebug/xdebug.c:1.270 Thu Aug 11 17:58:52 2005 GMT
+++ xdebug/xdebug.c Mon Aug 15 05:30:42 2005 GMT
@@ -89,10 +89,29 @@
 void xdebug_throw_exception_hook(zval *exception TSRMLS_DC);
 #endif
 
-#ifdef ZEND_ENGINE_2
-# if PHP_MINOR_VERSION == 0
+#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION == 0)
 int (*old_exit_handler)(ZEND_OPCODE_HANDLER_ARGS);
-# endif
+
+static int (*old_jmp_handler)(ZEND_OPCODE_HANDLER_ARGS);
+static int (*old_jmpz_handler)(ZEND_OPCODE_HANDLER_ARGS);
+static int (*old_is_identical_handler)(ZEND_OPCODE_HANDLER_ARGS);
+static int (*old_is_not_identical_handler)(ZEND_OPCODE_HANDLER_ARGS);
+static int (*old_is_equal_handler)(ZEND_OPCODE_HANDLER_ARGS);
+static int (*old_is_not_equal_handler)(ZEND_OPCODE_HANDLER_ARGS);
+static int (*old_is_smaller_handler)(ZEND_OPCODE_HANDLER_ARGS);
+static int (*old_is_smaller_or_equal_handler)(ZEND_OPCODE_HANDLER_ARGS);
+
+static int xdebug_jmp_handler(ZEND_OPCODE_HANDLER_ARGS);
+static int xdebug_jmpz_handler(ZEND_OPCODE_HANDLER_ARGS);
+static int xdebug_is_identical_handler(ZEND_OPCODE_HANDLER_ARGS);
+static int xdebug_is_not_identical_handler(ZEND_OPCODE_HANDLER_ARGS);
+static int xdebug_is_equal_handler(ZEND_OPCODE_HANDLER_ARGS);
+static int xdebug_is_not_equal_handler(ZEND_OPCODE_HANDLER_ARGS);
+static int xdebug_is_smaller_handler(ZEND_OPCODE_HANDLER_ARGS);
+static int xdebug_is_smaller_or_equal_handler(ZEND_OPCODE_HANDLER_ARGS);
+#endif
+
+#ifdef ZEND_ENGINE_2
 int xdebug_exit_handler(ZEND_OPCODE_HANDLER_ARGS);
 #endif
 

[FILE: /xdebug/tests/bug00032-ze1.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xdebug/tests/bug00032-ze1.phpt:1.2 Sun Apr 11 18:29:48 2004 GMT
+++ xdebug/tests/bug00032-ze1.phpt Mon Aug 15 05:30:42 2005 GMT
@@ -7,6 +7,7 @@
 xdebug.auto_trace=0
 xdebug.collect_params=1
 xdebug.profiler_enable=0
+xdebug.show_local_vars=0
 --FILE--
 <?php
         ${1} = "foo";

[FILE: /xdebug/tests/bug00057-ze1.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xdebug/tests/bug00057-ze1.phpt:1.2 Sun Apr 11 18:29:48 2004 GMT
+++ xdebug/tests/bug00057-ze1.phpt Mon Aug 15 05:30:42 2005 GMT
@@ -6,8 +6,10 @@
 xdebug.default_enable=1
 xdebug.auto_trace=0
 xdebug.collect_params=1
+xdebug.collect_return=0
 xdebug.show_mem_delta=0
 xdebug.profiler_enable=0
+xdebug.show_local_vars=0
 --FILE--
 <?php
 class OO {

[FILE: /xdebug/tests/test10.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xdebug/tests/test10.phpt:1.8 Fri Jul 02 12:06:51 2004 GMT
+++ xdebug/tests/test10.phpt Mon Aug 15 05:30:42 2005 GMT
@@ -6,6 +6,7 @@
 xdebug.enable=1
 xdebug.auto_trace=0
 xdebug.collect_params=1
+xdebug.collect_return=0
 xdebug.auto_profile=0
 xdebug.profiler_enable=0
 xdebug.trace_format=0

[FILE: /xdebug/tests/test20.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xdebug/tests/test20.phpt:1.7 Fri Jul 02 13:11:39 2004 GMT
+++ xdebug/tests/test20.phpt Mon Aug 15 05:30:42 2005 GMT
@@ -6,6 +6,7 @@
 xdebug.enable=1
 xdebug.auto_trace=0
 xdebug.collect_params=1
+xdebug.collect_return=0
 xdebug.auto_profile=0
 xdebug.profiler_enable=0
 xdebug.trace_format=0

[FILE: /xdebug/tests/test7.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xdebug/tests/test7.phpt:1.7 Fri Jul 02 12:06:51 2004 GMT
+++ xdebug/tests/test7.phpt Mon Aug 15 05:30:42 2005 GMT
@@ -7,6 +7,7 @@
 xdebug.auto_trace=0
 xdebug.auto_profile=0
 xdebug.collect_params=1
+xdebug.collect_return=0
 xdebug.profiler_enable=0
 xdebug.trace_format=0
 --FILE--

[FILE: /xdebug/tests/test9.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xdebug/tests/test9.phpt:1.8 Fri Jul 02 12:06:51 2004 GMT
+++ xdebug/tests/test9.phpt Mon Aug 15 05:30:42 2005 GMT
@@ -6,6 +6,7 @@
 xdebug.enable=1
 xdebug.auto_trace=0
 xdebug.collect_params=1
+xdebug.collect_return=0
 xdebug.auto_profile=0
 xdebug.profiler_enable=0
 xdebug.trace_format=0
Received on Mon Aug 15 2005 - 09:30:49 BST