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

derick Sun, 31 Jan 2010 15:38:47 +0000

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

Log:
- Fixed bug #528: Core dump generated with remote_connect_back option set and
  CLI usage.

Changed paths:
    U xdebug/trunk/xdebug.c

Modified: xdebug/trunk/xdebug.c
===================================================================
--- xdebug/trunk/xdebug.c 2010-01-25 10:12:16 UTC (rev 3213)
+++ xdebug/trunk/xdebug.c 2010-01-31 15:38:47 UTC (rev 3214)
@@ -42,7 +42,6 @@
 #include "ext/standard/head.h"
 #include "ext/standard/html.h"
 #include "ext/standard/info.h"
-#include "ext/standard/php_smart_str.h"
 #include "ext/standard/php_string.h"
 #include "php_globals.h"
 #include "ext/standard/php_var.h"
@@ -1123,7 +1122,11 @@
                         if (XG(remote_connect_back)) {
                                 zval **remote_addr = NULL;
                                 zend_hash_find(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]), "REMOTE_ADDR", 12, (void**)&remote_addr);
- XG(context).socket = xdebug_create_socket(Z_STRVAL_PP(remote_addr), XG(remote_port));
+ if (remote_addr) {
+ XG(context).socket = xdebug_create_socket(Z_STRVAL_PP(remote_addr), XG(remote_port));
+ } else {
+ XG(context).socket = xdebug_create_socket(XG(remote_host), XG(remote_port));
+ }
                         } else {
                                 XG(context).socket = xdebug_create_socket(XG(remote_host), XG(remote_port));
                         }
Received on Sun Jan 31 2010 - 15:38:48 GMT