[xdebug-dev] xdebug xdebug/xdebug.c - Changed default debugging protocol to dbgp instead of gdb.

Date: Mon Aug 23 08:32:14 CEST 2004
User: Derick Rethans
Directory: xdebug

Log Message:
[0.50]
- Changed default debugging protocol to dbgp instead of gdb.
- Fixed a problem with breakpoints on a non-static method call.
- Fixed a problem where internal function calls were not registered for
  code coverage.

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

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- xdebug/xdebug.c:1.233 Mon Aug 16 05:59:26 2004 GMT
+++ xdebug/xdebug.c Mon Aug 23 04:32:14 2004 GMT
@@ -277,7 +277,7 @@
 
         /* Remote debugger settings */
         STD_PHP_INI_BOOLEAN("xdebug.remote_enable", "0", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateBool, remote_enable, zend_xdebug_globals, xdebug_globals)
- STD_PHP_INI_ENTRY("xdebug.remote_handler", "gdb", PHP_INI_ALL, OnUpdateString, remote_handler, zend_xdebug_globals, xdebug_globals)
+ STD_PHP_INI_ENTRY("xdebug.remote_handler", "dbgp", PHP_INI_ALL, OnUpdateString, remote_handler, zend_xdebug_globals, xdebug_globals)
         STD_PHP_INI_ENTRY("xdebug.remote_host", "localhost", PHP_INI_ALL, OnUpdateString, remote_host, zend_xdebug_globals, xdebug_globals)
         PHP_INI_ENTRY("xdebug.remote_mode", "req", PHP_INI_ALL, OnUpdateDebugMode)
 #if ZEND_EXTENSION_API_NO < 90000000
@@ -810,6 +810,10 @@
                 }
         }
 
+ if (XG(do_code_coverage)) {
+ xdebug_count_line(tmp->filename, tmp->lineno TSRMLS_CC);
+ }
+
         if (XDEBUG_LLIST_TAIL(XG(stack))) {
                 function_stack_entry *prev = XDEBUG_LLIST_VALP(XDEBUG_LLIST_TAIL(XG(stack)));
                 tmp->prev = prev;
@@ -881,11 +885,7 @@
         }
         /* class->function breakpoints */
         else if (fse->function.type == XFUNC_MEMBER || fse->function.type == XFUNC_STATIC_MEMBER) {
- if (fse->function.type == XFUNC_MEMBER) {
- tmp_name = xdebug_sprintf("%s->%s", fse->function.class, fse->function.function);
- } else if (fse->function.type == XFUNC_STATIC_MEMBER) {
- tmp_name = xdebug_sprintf("%s::%s", fse->function.class, fse->function.function);
- }
+ tmp_name = xdebug_sprintf("%s::%s", fse->function.class, fse->function.function);
 
                 if (xdebug_hash_find(XG(context).class_breakpoints, tmp_name, strlen(tmp_name), (void *) &extra_brk_info)) {
                         /* Yup, breakpoint found, call handler if the breakpoint is not
Received on Mon Aug 23 2004 - 08:32:20 BST