[xdebug-dev] xdebug xdebug/xdebug.c - Allow "xdebug.default_enable" to be set everywhere.

Date: Sun Jun 19 14:51:50 CEST 2005
User: Derick Rethans
Directory: xdebug

Log Message:
[0.25]
- Allow "xdebug.default_enable" to be set everywhere.
- Make it compile with HEAD again.

Modified files:
           xdebug/xdebug.c (version: 1.263)

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- xdebug/xdebug.c:1.262 Tue Jun 14 11:54:08 2005 GMT
+++ xdebug/xdebug.c Sun Jun 19 10:51:49 2005 GMT
@@ -274,7 +274,7 @@
         STD_PHP_INI_BOOLEAN("xdebug.collect_includes","1", PHP_INI_ALL, OnUpdateBool, collect_includes, zend_xdebug_globals, xdebug_globals)
         STD_PHP_INI_BOOLEAN("xdebug.collect_params", "0", PHP_INI_ALL, OnUpdateBool, collect_params, zend_xdebug_globals, xdebug_globals)
         STD_PHP_INI_BOOLEAN("xdebug.collect_return", "0", PHP_INI_ALL, OnUpdateBool, collect_return, zend_xdebug_globals, xdebug_globals)
- STD_PHP_INI_BOOLEAN("xdebug.default_enable", "1", PHP_INI_SYSTEM, OnUpdateBool, default_enable, zend_xdebug_globals, xdebug_globals)
+ STD_PHP_INI_BOOLEAN("xdebug.default_enable", "1", PHP_INI_ALL, OnUpdateBool, default_enable, zend_xdebug_globals, xdebug_globals)
         STD_PHP_INI_BOOLEAN("xdebug.extended_info", "1", PHP_INI_SYSTEM, OnUpdateBool, extended_info, zend_xdebug_globals, xdebug_globals)
         STD_PHP_INI_ENTRY("xdebug.manual_url", "http://www.php.net", PHP_INI_ALL, OnUpdateString, manual_url, zend_xdebug_globals, xdebug_globals)
 #if ZEND_EXTENSION_API_NO < 90000000
@@ -2365,8 +2365,15 @@
 
 ZEND_DLEXPORT int xdebug_zend_startup(zend_extension *extension)
 {
+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1
+ TSRMLS_FETCH();
+#endif
         zend_xdebug_initialised = 1;
+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1
+ return zend_startup_module(&xdebug_module_entry TSRMLS_CC);
+#else
         return zend_startup_module(&xdebug_module_entry);
+#endif
 }
 
 ZEND_DLEXPORT void xdebug_zend_shutdown(zend_extension *extension)
Received on Sun Jun 19 2005 - 14:51:53 BST