com php-src: Merge branch 'master' of github.com:krakjoe/phpdbg: phpdbg.h phpdbg_prompt.c

From: Date: Mon, 27 Oct 2014 09:19:59 +0000
Subject: com php-src: Merge branch 'master' of github.com:krakjoe/phpdbg: phpdbg.h phpdbg_prompt.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-82695@lists.php.net to get a copy of this message
Commit: 08684a98281810ea8917fc26619fa365d9154126 Author: Anatol Belski <ab@php.net> Mon, 27 Oct 2014 10:19:59 +0100 Parents: 0e7987c61aef9965d9b6b9dd0cd6f0bc3d6acae0 f4748ff9fff3147276e4d37ff5cdfd4ca9dc1fa5 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=08684a98281810ea8917fc26619fa365d9154126 Log: Merge branch 'master' of github.com:krakjoe/phpdbg Conflicts: phpdbg_prompt.c Changed paths: MM phpdbg.h MM phpdbg_prompt.c Diff: diff --cc phpdbg_prompt.c index 72063c1,5e2cc03..0e527c6 --- a/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);

« previous php.cvs (#82695) next »