Always output request id in containers

diff --git a/phpdbg_bp.c b/phpdbg_bp.c
index f2ef4228ea16b88457a4fc3ea8f7c8c24c525bee..fa9355cb243e4fc9c809aed4b3ebea472b0d1093 100644 (file)
--- a/phpdbg_bp.c
+++ b/phpdbg_bp.c
@@ -1332,7 +1332,7 @@ PHPDBG_API phpdbg_breakbase_t *phpdbg_find_breakbase_ex(zend_ulong id, HashTable
 
 PHPDBG_API void phpdbg_print_breakpoints(zend_ulong type TSRMLS_DC) /* {{{ */
 {
-       phpdbg_xml("<breakpoints>");
+       phpdbg_xml("<breakpoints %r>");
 
        switch (type) {
                case PHPDBG_BREAK_SYM: if ((PHPDBG_G(flags) & PHPDBG_HAS_SYM_BP)) {

diff --git a/phpdbg_info.c b/phpdbg_info.c
index a85484238c3cae51214b2462a6663bdf5f67a564..0f1d191aa35251001aadefc82cd2dc3e411784cb 100644 (file)
--- a/phpdbg_info.c
+++ b/phpdbg_info.c
@@ -338,7 +338,7 @@ PHPDBG_INFO(classes) /* {{{ */
                phpdbg_print_class_name(ce TSRMLS_CC);
 
                if ((*ce)->parent) {
-                       phpdbg_xml("<parents>");
+                       phpdbg_xml("<parents %r>");
                        zend_class_entry *pce = (*ce)->parent;
                        do {
                                phpdbg_out("|-------- ");

diff --git a/phpdbg_print.c b/phpdbg_print.c
index 799734c9fa35c5f5129ea290d335fe4c13781d94..9a8edb3abaf2e7762f78bdb8f2607737cbdf876d 100644 (file)
--- a/phpdbg_print.c
+++ b/phpdbg_print.c
@@ -167,7 +167,7 @@ PHPDBG_PRINT(class) /* {{{ */
                        (*ce)->name,
                        zend_hash_num_elements(&(*ce)->function_table));
 
-               phpdbg_xml("<printmethods>");
+               phpdbg_xml("<printmethods %r>");
 
                if (zend_hash_num_elements(&(*ce)->function_table)) {
                        HashPosition position;

diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index ad8c104475cfb53e372865eba3e6141db50e82b8..992d50f1107e562fa0200abfa25acb7a896890f4 100644 (file)
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -671,7 +671,7 @@ out:
 
 int phpdbg_output_ev_variable(char *name, size_t len, char *keyname, size_t keylen, HashTable *parent, zval **zv TSRMLS_DC) {
        phpdbg_notice("eval", "variable=\"%.*s\"", "Printing variable %.*s", (int) len, name);
-       phpdbg_xml("<eval>");
+       phpdbg_xml("<eval %r>");
        zend_print_zval_r(*zv, 0 TSRMLS_CC);
        phpdbg_xml("</eval>");
        phpdbg_out("\n");
@@ -704,7 +704,7 @@ PHPDBG_COMMAND(ev) /* {{{ */
        PHPDBG_G(flags) |= PHPDBG_IN_EVAL;
        zend_try {
                if (zend_eval_stringl(param->str, param->len,&retval, "eval()'d code" TSRMLS_CC) == SUCCESS) {
-                       phpdbg_xml("<eval>");
+                       phpdbg_xml("<eval %r>");
                        zend_print_zval_r(&retval, 0 TSRMLS_CC);
                        phpdbg_xml("</eval>");
                        phpdbg_out("\n");
@@ -742,7 +742,7 @@ PHPDBG_COMMAND(back) /* {{{ */
 PHPDBG_COMMAND(print) /* {{{ */
 {
        phpdbg_out("Execution Context Information\n\n");
-       phpdbg_xml("<printinfo>");
+       phpdbg_xml("<printinfo %r>");
 #ifdef HAVE_LIBREADLINE
        phpdbg_writeln("print", "readline=\"yes\"", "Readline   yes");
 #else
@@ -1110,7 +1110,7 @@ PHPDBG_COMMAND(clean) /* {{{ */
        }
 
        phpdbg_out("Cleaning Execution Environment\n");
-       phpdbg_xml("<cleaninfo>");
+       phpdbg_xml("<cleaninfo %r>");
 
        phpdbg_writeln("clean", "classes=\"%d\"", "Classes    %d", zend_hash_num_elements(EG(class_table)));
        phpdbg_writeln("clean", "functions=\"%d\"", "Functions  %d", zend_hash_num_elements(EG(function_table)));
@@ -1127,7 +1127,7 @@ PHPDBG_COMMAND(clean) /* {{{ */
 PHPDBG_COMMAND(clear) /* {{{ */
 {
        phpdbg_out("Clearing Breakpoints\n");
-       phpdbg_xml("<clearinfo>");
+       phpdbg_xml("<clearinfo %r>");
 
        phpdbg_writeln("clear", "files=\"%d\"", "File              %d", zend_hash_num_elements(&PHPDBG_G(bp)[PHPDBG_BREAK_FILE]));
        phpdbg_writeln("clear", "functions=\"%d\"", "Functions         %d", zend_hash_num_elements(&PHPDBG_G(bp)[PHPDBG_BREAK_SYM]));

diff --git a/phpdbg_watch.c b/phpdbg_watch.c
index be37a96f165c3442a5331f0238d9b5c8810d5d57..af1bcc97155a11dc7c0d907af83a010ddc9e743a 100644 (file)
--- a/phpdbg_watch.c
+++ b/phpdbg_watch.c
@@ -550,7 +550,7 @@ static void phpdbg_print_changed_zval(phpdbg_watch_memdump *dump TSRMLS_DC) {
                                PHPDBG_G(watchpoint_hit) = 1;
 
                                phpdbg_notice("watchhit", "variable=\"%s\"", "Breaking on watchpoint %.*s", (int) watch->str_len, watch->str);
-                               phpdbg_xml("<watchdata>");
+                               phpdbg_xml("<watchdata %r>");
                        }
 
                        switch (watch->type) {
@@ -564,7 +564,7 @@ static void phpdbg_print_changed_zval(phpdbg_watch_memdump *dump TSRMLS_DC) {
                                                        phpdbg_writeln("watchvalue", "type=\"old\" inaccessible=\"inaccessible\"", "Old value inaccessible, array or object (HashTable) already destroyed");
                                                } else {
                                                        phpdbg_out("Old value: ");
-                                                       phpdbg_xml("<watchvalue type=\"old\">");
+                                                       phpdbg_xml("<watchvalue %r type=\"old\">");
                                                        zend_print_flat_zval_r((zval *) oldPtr TSRMLS_CC);
                                                        phpdbg_xml("</watchvalue>");
                                                        phpdbg_out("\n");
@@ -590,7 +590,7 @@ static void phpdbg_print_changed_zval(phpdbg_watch_memdump *dump TSRMLS_DC) {
 
                                        if (show_value) {
                                                phpdbg_out("New value: ");
-                                               phpdbg_xml("<watchvalue type=\"new\">");
+                                               phpdbg_xml("<watchvalue %r type=\"new\">");
                                                zend_print_flat_zval_r(watch->addr.zv TSRMLS_CC);
                                                phpdbg_xml("</watchvalue>");
                                                phpdbg_out("\n");
@@ -686,7 +686,7 @@ void phpdbg_list_watchpoints(TSRMLS_D) {
        HashPosition position;
        phpdbg_watchpoint_t **watch;
 
-       phpdbg_xml("<watchlist>");
+       phpdbg_xml("<watchlist %r>");
 
        for (zend_hash_internal_pointer_reset_ex(&PHPDBG_G(watchpoints), &position);
             zend_hash_get_current_data_ex(&PHPDBG_G(watchpoints), (void**) &watch, &position) == SUCCESS;

diff --git a/xml.md b/xml.md
index 5cf45535c7d2a9b44672e85742ffe0708aa0044c..bd5e6745032eea0e576bf264a29c91b7396d79ec 100644 (file)
--- a/xml.md
+++ b/xml.md
@@ -69,7 +69,7 @@ intro
 - appears on startup if -q flag wasn't provided as command line arg
 - before any input possibility
 - attributes may be spread over multiple tags
-- wrapped in <intros> tag
+- wrapped in &lt;intros> tag
 
 ### attributes ###