[xdebug-dev] svn: /xdebug/trunk/ tests/bug00567.phpt xdebug.c

derick Tue, 20 Apr 2010 13:42:42 +0000

Revision: http://svn.xdebug.org/cgi-bin/viewvc.cgi?view=rev&revision=3265&root=xdebug

Log:
- Fixed bug #567: xdebug_debug_zval and xdebug_debug_zval_stdout don't work
  with PHP 5.3. (Patch by Endo Hiroaki).

Changed paths:
    A xdebug/trunk/tests/bug00567.phpt
    U xdebug/trunk/xdebug.c

Added: xdebug/trunk/tests/bug00567.phpt
===================================================================
--- xdebug/trunk/tests/bug00567.phpt (rev 0)
+++ xdebug/trunk/tests/bug00567.phpt 2010-04-20 13:42:42 UTC (rev 3265)
@@ -0,0 +1,17 @@
+--TEST--
+Test for bug #567: xdebug_debug_zval() and xdebug_debug_zval_stdout() don't work with php 5.3.
+--INI--
+xdebug.default_enable=1
+--FILE--
+<?php
+function func(){
+ $a="hoge";
+ xdebug_debug_zval( 'a' );
+ xdebug_debug_zval_stdout( 'a' );
+}
+
+func();
+?>
+--EXPECT--
+a: (refcount=1, is_ref=0)='hoge'
+a: (refcount=1, is_ref=0)='hoge'(29)

Modified: xdebug/trunk/xdebug.c
===================================================================
--- xdebug/trunk/xdebug.c 2010-04-20 13:39:08 UTC (rev 3264)
+++ xdebug/trunk/xdebug.c 2010-04-20 13:42:42 UTC (rev 3265)
@@ -1467,6 +1467,12 @@
                 WRONG_PARAM_COUNT;
         }

+#if PHP_VERSION_ID >= 50300
+ if (!EG(active_symbol_table)) {
+ zend_rebuild_symbol_table(TSRMLS_C);
+ }
+#endif
+
         for (i = 0; i < argc; i++) {
                 if (Z_TYPE_PP(args[i]) == IS_STRING) {
                         XG(active_symbol_table) = EG(active_symbol_table);
@@ -1507,7 +1513,13 @@
                 efree(args);
                 WRONG_PARAM_COUNT;
         }
-
+
+#if PHP_VERSION_ID >= 50300
+ if (!EG(active_symbol_table)) {
+ zend_rebuild_symbol_table(TSRMLS_C);
+ }
+#endif
+
         for (i = 0; i < argc; i++) {
                 if (Z_TYPE_PP(args[i]) == IS_STRING) {
                         XG(active_symbol_table) = EG(active_symbol_table);
Received on Tue Apr 20 2010 - 14:42:42 BST