Merge branch 'master' of https://github.com/krakjoe/phpdbg into frames

Conflicts:
	phpdbg.h
	phpdbg_prompt.c

diff --cc phpdbg.c
index 4b9d39b6388df27b10c9c4605df8e2351f85e972,f15f49f589a72bb3f543b2d22a59e44e40fb83b6..235660f7f152c85dca91425b3eb5228024f31541
--- 1/phpdbg.c
--- 2/phpdbg.c
+++ b/phpdbg.c
@@@ -44,8 -44,10 +44,11 @@@ static inline void php_phpdbg_globals_c
      pg->lcmd = NULL;
      pg->flags = PHPDBG_DEFAULT_FLAGS;
      pg->oplog = NULL;
+     pg->io[PHPDBG_STDIN] = NULL;
+     pg->io[PHPDBG_STDOUT] = NULL;
+     pg->io[PHPDBG_STDERR] = NULL;
      memset(&pg->lparam, 0, sizeof(phpdbg_param_t));
 +    pg->frame.num = 0;
  } /* }}} */
  
  static PHP_MINIT_FUNCTION(phpdbg) /* {{{ */

diff --cc phpdbg.h
index 98c007036e936715988132c75604cb26378b768e,aa6c7ca7c2d32108ac9daff4ff1eb02d51d77594..3e25965e912c606667cdba5a60dd8bb45f63c1dc
--- 1/phpdbg.h
--- 2/phpdbg.h
+++ b/phpdbg.h
@@@ -127,7 -132,7 +133,8 @@@ ZEND_BEGIN_MODULE_GLOBALS(phpdbg
        HashTable seek;                                         /* seek oplines */
        zend_ulong flags;                   /* phpdbg flags */
        HashTable registered;                           /* registered */
 +      phpdbg_frame frame;             /* frame */
+       FILE *io[3];                                            /* stdin/stdout/stderr */
  ZEND_END_MODULE_GLOBALS(phpdbg) /* }}} */
  
  #endif /* PHPDBG_H */

diff --cc phpdbg_prompt.c
index 3a7ebacdb8abb975377299125b605ee541f148b6,fdd60449bf10079dfe2917f71584651bf9e42072..27f0b739914fb3c2f9cd0408ab134e5243293720
--- 1/phpdbg_prompt.c
--- 2/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@@ -32,10 -32,9 +32,10 @@@
  #include "phpdbg_utils.h"
  #include "phpdbg_prompt.h"
  #include "phpdbg_cmd.h"
 +#include "phpdbg_frame.h"
  
  /* {{{ command declarations */
- static const phpdbg_command_t phpdbg_prompt_commands[] = {
+ const phpdbg_command_t phpdbg_prompt_commands[] = {
        PHPDBG_COMMAND_D(exec,    "set execution context",                    'e', NULL, 1),
        PHPDBG_COMMAND_D(compile, "attempt compilation",                                          'c', NULL, 0),
        PHPDBG_COMMAND_D(step,    "step through execution",                   's', NULL, 1),

diff --cc phpdbg_prompt.h
Simple merge