Merge branch 'xml-protocol'

Conflicts:
	phpdbg.c
	phpdbg_list.c

diff --cc phpdbg.c
index d30e4951644ad11b0b03e4bd5bd64d29f1d2070d,1a7a1f83106da2f3a07d7c9e229eb0bf9bea8114..a8fb37ab835ebb4f9e099ea3764c151fc95bbef6
--- 1/phpdbg.c
--- 2/phpdbg.c
+++ b/phpdbg.c
@@@ -663,8 -697,11 +697,9 @@@ const opt_struct OPTIONS[] = { /* {{{ *
        {'r', 0, "run"},
        {'E', 0, "step-through-eval"},
        {'S', 1, "sapi-name"},
 -#ifndef _WIN32
        {'l', 1, "listen"},
        {'a', 1, "address-or-any"},
 -#endif
+       {'x', 0, "xml output"},
        {'V', 0, "version"},
        {'-', 0, NULL}
  }; /* }}} */
@@@ -1161,7 -1204,12 +1202,11 @@@ phpdbg_main
                                        address = strdup("*");
                                } else address = strdup(php_optarg);
                        } break;
 -#endif
  
+                       case 'x':
+                               flags |= PHPDBG_WRITE_XML;
+                       break;
+ 
                        case 'V': {
                                sapi_startup(phpdbg);
                                phpdbg->startup(phpdbg);
@@@ -1249,9 -1297,11 +1294,10 @@@
  #endif
                zend_mm_heap *mm_heap;
  
 -#ifndef _WIN32
        /* setup remote server if necessary */
        if (!cleaning && listen > 0) {
-               if (phpdbg_remote_init(address, listen, &server, &socket, &stream) == FAILURE) {
+               server = phpdbg_open_socket(address, listen);
+               if (phpdbg_remote_init(address, listen, server, &socket, &stream) == FAILURE) {
                        exit(0);
                }
  
@@@ -1467,11 -1526,12 +1516,11 @@@ phpdbg_out
  
  #ifdef _WIN32
        } __except(phpdbg_exception_handler_win32(xp = GetExceptionInformation())) {
-               phpdbg_error("Access violation (Segementation fault) encountered\ntrying to abort cleanly...");
+               phpdbg_error("segfault", "", "Access violation (Segementation fault) encountered\ntrying to abort cleanly...");
        }
 -phpdbg_out:
 +/* phpdbg_out: */
  #endif
-       
+ 
                {
                        int i;
                        /* free argv */