[xdebug-dev] svn: /xdebug/trunk/ xdebug.c xdebug_handler_dbgp.c

derick Tue, 29 Dec 2009 15:20:08 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=3175

Log:
- Possible fix for #324: xdebug_dump_superglobals() only dumps superglobals
  that were accessed before, and #478: XDebug 2.0.x can't use %R in
  xdebug.profiler_output_name if register_long_arrays is off.

Changed paths:
    U xdebug/trunk/xdebug.c
    U xdebug/trunk/xdebug_handler_dbgp.c

Modified: xdebug/trunk/xdebug.c
===================================================================
--- xdebug/trunk/xdebug.c 2009-12-29 15:09:29 UTC (rev 3174)
+++ xdebug/trunk/xdebug.c 2009-12-29 15:20:08 UTC (rev 3175)
@@ -942,10 +942,16 @@
                 XG(ide_key) = xdstrdup(idekey);
         }

- /* This is to kick the global variable JIT-mechanism in PHP */
-#ifdef ZEND_ENGINE_2
- zend_is_auto_global("_SERVER", sizeof("_SERVER")-1 TSRMLS_CC);
-#endif
+/* {{{ Initialize auto globals in Zend Engine 2 */
+ zend_is_auto_global("_ENV", sizeof("_ENV")-1 TSRMLS_CC);
+ zend_is_auto_global("_GET", sizeof("_GET")-1 TSRMLS_CC);
+ zend_is_auto_global("_POST", sizeof("_POST")-1 TSRMLS_CC);
+ zend_is_auto_global("_COOKIE", sizeof("_COOKIE")-1 TSRMLS_CC);
+ zend_is_auto_global("_REQUEST", sizeof("_REQUEST")-1 TSRMLS_CC);
+ zend_is_auto_global("_FILES", sizeof("_FILES")-1 TSRMLS_CC);
+ zend_is_auto_global("_SERVER", sizeof("_SERVER")-1 TSRMLS_CC);
+ zend_is_auto_global("_SESSION", sizeof("_SESSION")-1 TSRMLS_CC);
+/* }}} */

         /* Check if we have this special get variable that stops a debugging
          * request without executing any code */

Modified: xdebug/trunk/xdebug_handler_dbgp.c
===================================================================
--- xdebug/trunk/xdebug_handler_dbgp.c 2009-12-29 15:09:29 UTC (rev 3174)
+++ xdebug/trunk/xdebug_handler_dbgp.c 2009-12-29 15:20:08 UTC (rev 3175)
@@ -2416,17 +2416,6 @@
                 options->runtime[i].current_element_nr = 0;
         }

-/* {{{ Initialize auto globals in Zend Engine 2 */
- zend_is_auto_global("_ENV", sizeof("_ENV")-1 TSRMLS_CC);
- zend_is_auto_global("_GET", sizeof("_GET")-1 TSRMLS_CC);
- zend_is_auto_global("_POST", sizeof("_POST")-1 TSRMLS_CC);
- zend_is_auto_global("_COOKIE", sizeof("_COOKIE")-1 TSRMLS_CC);
- zend_is_auto_global("_REQUEST", sizeof("_REQUEST")-1 TSRMLS_CC);
- zend_is_auto_global("_FILES", sizeof("_FILES")-1 TSRMLS_CC);
- zend_is_auto_global("_SERVER", sizeof("_SERVER")-1 TSRMLS_CC);
- zend_is_auto_global("_SESSION", sizeof("_SESSION")-1 TSRMLS_CC);
-/* }}} */
-
         context->breakpoint_list = xdebug_hash_alloc(64, (xdebug_hash_dtor) xdebug_hash_admin_dtor);
         context->function_breakpoints = xdebug_hash_alloc(64, (xdebug_hash_dtor) xdebug_hash_brk_dtor);
         context->exception_breakpoints = xdebug_hash_alloc(64, (xdebug_hash_dtor) xdebug_hash_brk_dtor);
Received on Tue Dec 29 2009 - 15:20:09 GMT