[xdebug-dev] xdebug xdebug/xdebug.c - Fixed bug #87: Warning about headers when "register_shutdown_function" used.

Date: Thu Mar 9 14:06:20 CET 2006
User: Derick Rethans
Directory: xdebug

Log Message:
[0.25]
- Fixed bug #87: Warning about headers when "register_shutdown_function" used.

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

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- xdebug/xdebug.c:1.302 Tue Mar 07 20:30:54 2006 GMT
+++ xdebug/xdebug.c Thu Mar 09 12:06:20 2006 GMT
@@ -1181,6 +1181,7 @@
                                 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);
                         magic_cookie = xdstrdup(Z_STRVAL_PP(dummy));
@@ -1201,7 +1202,7 @@
                         XG(ide_key) = xdstrdup(Z_STRVAL_PP(dummy));
                 } else if (getenv("XDEBUG_CONFIG")) {
                         magic_cookie = xdstrdup(getenv("XDEBUG_CONFIG"));
- if (XG(ide_key) && *XG(ide_key)) {
+ if (XG(ide_key) && *XG(ide_key) && !SG(headers_sent)) {
                                 php_setcookie("XDEBUG_SESSION", sizeof("XDEBUG_SESSION"), XG(ide_key), strlen(XG(ide_key)), time(NULL) + 3600, "/", 1, NULL, 0, 0 COOKIE_ENCODE TSRMLS_CC);
                         }
                 }
@@ -1216,6 +1217,7 @@
                                 PG(http_globals)[TRACK_VARS_POST] &&
                                 zend_hash_find(PG(http_globals)[TRACK_VARS_POST]->value.ht, "XDEBUG_SESSION_STOP", sizeof("XDEBUG_SESSION_STOP"), (void **) &dummy) == SUCCESS
                         )
+ && !SG(headers_sent)
                 ) {
                         php_setcookie("XDEBUG_SESSION", sizeof("XDEBUG_SESSION"), "", 0, time(NULL) + 3600, "/", 1, NULL, 0, 0 COOKIE_ENCODE TSRMLS_CC);
                 }
Received on Thu Mar 09 2006 - 14:06:25 GMT