[xdebug-dev] xdebug xdebug/php_xdebug.h xdebug/xdebug.c - The zif_ trick doesn't work on Windows, so work around it by storing

Date: Tue Feb 28 09:54:46 CET 2006
User: Derick Rethans
Directory: xdebug

Log Message:
[0.25]
- The zif_ trick doesn't work on Windows, so work around it by storing
  the original handler in a request global.

Modified files:
           xdebug/php_xdebug.h (version: 1.101)
           xdebug/xdebug.c (version: 1.301)

[FILE: /xdebug/php_xdebug.h]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- xdebug/php_xdebug.h:1.100 Tue Jan 31 20:04:04 2006 GMT
+++ xdebug/php_xdebug.h Tue Feb 28 07:54:46 2006 GMT
@@ -117,6 +117,8 @@
         HashTable *active_symbol_table;
         unsigned int prev_memory;
 
+ void (*orig_set_time_limit_func)(INTERNAL_FUNCTION_PARAMETERS);
+
         FILE *trace_file;
         zend_bool do_trace;
         zend_bool auto_trace;

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- xdebug/xdebug.c:1.300 Mon Feb 27 19:59:20 2006 GMT
+++ xdebug/xdebug.c Tue Feb 28 07:54:46 2006 GMT
@@ -722,6 +722,7 @@
 
         /* Override set_time_limit with our own function to prevent timing out while debugging */
         zend_hash_find(EG(function_table), "set_time_limit", 15, (void **)&orig);
+ XG(orig_set_time_limit_func) = orig->internal_function.handler;
         orig->internal_function.handler = zif_xdebug_set_time_limit;
 
         return SUCCESS;
@@ -2076,7 +2077,7 @@
 PHP_FUNCTION(xdebug_set_time_limit)
 {
         if (!XG(remote_enabled)) {
- zif_set_time_limit(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+ XG(orig_set_time_limit_func)(INTERNAL_FUNCTION_PARAM_PASSTHRU);
         }
 }
 /* }}} */
Received on Tue Feb 28 2006 - 09:55:48 GMT