[xdebug-dev] xdebug xdebug/xdebug.c - Fixed bug #208: Socket connection attempted when XDEBUG_SESSION_STOP.

Date: Wed Oct 18 12:00:34 CEST 2006
User: Derick Rethans
Directory: xdebug

Log Message:
[0.50]
- Fixed bug #208: Socket connection attempted when XDEBUG_SESSION_STOP.
- Fixed bug #211: When starting a new session with a different idekey, the
  cookie is not updated.

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

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- xdebug/xdebug.c:1.355 Mon Oct 16 18:11:23 2006 GMT
+++ xdebug/xdebug.c Wed Oct 18 08:00:34 2006 GMT
@@ -1265,10 +1265,7 @@
                         ) || (
                                 PG(http_globals)[TRACK_VARS_POST] &&
                                 zend_hash_find(PG(http_globals)[TRACK_VARS_POST]->value.ht, "XDEBUG_SESSION_START", sizeof("XDEBUG_SESSION_START"), (void **) &dummy) == SUCCESS
- )) && !(
- PG(http_globals)[TRACK_VARS_COOKIE] &&
- zend_hash_find(PG(http_globals)[TRACK_VARS_COOKIE]->value.ht, "XDEBUG_SESSION", sizeof("XDEBUG_SESSION"), (void **) &dummy) == SUCCESS
- )
+ ))
                         && !SG(headers_sent)
                 ) {
                         convert_to_string_ex(dummy);
@@ -1309,6 +1306,10 @@
                         )
                         && !SG(headers_sent)
                 ) {
+ if (magic_cookie) {
+ xdfree(magic_cookie);
+ magic_cookie = NULL;
+ }
                         php_setcookie("XDEBUG_SESSION", sizeof("XDEBUG_SESSION"), "", 0, time(NULL) + 3600, "/", 1, NULL, 0, 0 COOKIE_ENCODE TSRMLS_CC);
                 }
 
@@ -1338,6 +1339,10 @@
                                 }
                         }
                 }
+ if (magic_cookie) {
+ xdfree(magic_cookie);
+ magic_cookie = NULL;
+ }
 
                 /* Check for special GET/POST parameter to start profiling */
                 if (
@@ -1363,8 +1368,6 @@
                                 XG(profiler_enabled) = 1;
                         }
                 }
- xdfree(magic_cookie);
- magic_cookie = NULL;
         }
 
         XG(level)++;
Received on Wed Oct 18 2006 - 12:00:43 BST