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

Conflicts:
	phpdbg_prompt.c

diff --cc phpdbg.h
Simple merge

diff --cc phpdbg_prompt.c
index 72063c194af778799d565a69e0130aa1bc091797,5e2cc03d5020b1d70afbf10a0ceca36115bc6563..0e527c6f6bf69c612b9d5512b5652f3bd9d4d56a
--- 1/phpdbg_prompt.c
--- 2/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@@ -1211,57 -1261,48 +1261,56 @@@ int phpdbg_interactive(zend_bool allow_
  
  #ifdef PHP_WIN32
  #define PARA ((phpdbg_param_t *)stack.next)->type
 -                      if (PHPDBG_G(flags) & PHPDBG_IS_REMOTE && (RUN_PARAM == PARA || EVAL_PARAM == PARA)) {
 +#define HANDLE_SIGIO (PHPDBG_G(flags) & PHPDBG_IS_REMOTE) && PARA != EMPTY_PARAM
-                               if (HANDLE_SIGIO) {
-                                       sigio_watcher_start();
-                               }
++                      if (HANDLE_SIGIO) {
+                               sigio_watcher_start();
+                       }
  #endif
-                               switch (ret = phpdbg_stack_execute(&stack, allow_async_unsafe TSRMLS_CC)) {
-                                       case FAILURE:
-                                               if (!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)) {
-                                                       if (!allow_async_unsafe || phpdbg_call_register(&stack TSRMLS_CC) == FAILURE) {
-                                                               phpdbg_output_err_buf(NULL, "%b", "%b" TSRMLS_CC);
-                                                       }
+                       switch (ret = phpdbg_stack_execute(&stack, allow_async_unsafe TSRMLS_CC)) {
+                               case FAILURE:
+                                       if (!(PHPDBG_G(flags) & PHPDBG_IS_STOPPING)) {
+                                               if (!allow_async_unsafe || phpdbg_call_register(&stack TSRMLS_CC) == FAILURE) {
+                                                       phpdbg_output_err_buf(NULL, "%b", "%b" TSRMLS_CC);
                                                }
-                                       break;
+                                       }
+                               break;
  
-                                       case PHPDBG_LEAVE:
-                                       case PHPDBG_FINISH:
-                                       case PHPDBG_UNTIL:
-                                       case PHPDBG_NEXT: {
+                               case PHPDBG_LEAVE:
+                               case PHPDBG_FINISH:
+                               case PHPDBG_UNTIL:
+                               case PHPDBG_NEXT: {
 +#ifdef PHP_WIN32
-                                               if (HANDLE_SIGIO) {
-                                                       sigio_watcher_stop();
-                                                       sigio_watcher_start();
-                                               }
++                                      if (HANDLE_SIGIO) {
++                                              sigio_watcher_stop();
++                                              sigio_watcher_start();
++                                      }
 +#endif
-                                               phpdbg_activate_err_buf(0 TSRMLS_CC);
-                                               phpdbg_free_err_buf(TSRMLS_C);
-                                               if (!EG(in_execution) && !(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)) {
-                                                       phpdbg_error("command", "type=\"noexec\"", "Not running");
-                                               }
-                                               goto out;
+                                       phpdbg_activate_err_buf(0 TSRMLS_CC);
+                                       phpdbg_free_err_buf(TSRMLS_C);
 -                                      if (!EG(in_execution) && !(PHPDBG_G(flags) & PHPDBG_IS_STOPPING)) {
++                                      if (!EG(in_execution) && !(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)) {
+                                               phpdbg_error("command", "type=\"noexec\"", "Not running");
                                        }
 -                                      break;
                                }
++                              break;
+                       }
  
-                               phpdbg_activate_err_buf(0 TSRMLS_CC);
-                               phpdbg_free_err_buf(TSRMLS_C);
+                       phpdbg_activate_err_buf(0 TSRMLS_CC);
+                       phpdbg_free_err_buf(TSRMLS_C);
  #ifdef PHP_WIN32
-                               if (HANDLE_SIGIO) {
-                                       sigio_watcher_stop();
-                               }
 -                      if (PHPDBG_G(flags) & PHPDBG_IS_REMOTE && (RUN_PARAM == PARA || EVAL_PARAM == PARA)) {
++                      if (HANDLE_SIGIO) {
+                               sigio_watcher_stop();
+                       }
  #undef PARA
 +#undef HANDLE_SIGIO
  #endif
-                       }
+               }
  
-                       phpdbg_stack_free(&stack);
-                       phpdbg_destroy_input(&input TSRMLS_CC);
-                       PHPDBG_G(req_id) = 0;
-               } while ((input = phpdbg_read_input(NULL TSRMLS_CC)));
+               phpdbg_stack_free(&stack);
+               phpdbg_destroy_input(&input TSRMLS_CC);
+               PHPDBG_G(req_id) = 0;
+               input = NULL;
        }
  
- out:
        if (input) {
                phpdbg_stack_free(&stack);
                phpdbg_destroy_input(&input TSRMLS_CC);