com php-src: Commented out a few PHPDBG_IS_QUITTING check s to fix bug If it does not work, please revert...: phpdbg_prompt.c
| From: | Bob Weinand | Date: | Wed, 16 Apr 2014 18:55:41 +0000 |
| Subject: | com php-src: Commented out a few PHPDBG_IS_QUITTING check s to fix bug If it does not work, please revert...: phpdbg_prompt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76976@lists.php.net to get a copy of this message | ||
Commit: a0ee96289b7e9a06e9dbb66f40258fc09b55cde2
Author: Bob Weinand <bobwei9@hotmail.com> Wed, 16 Apr 2014 20:55:41 +0200
Parents: 58c3f7e6992737948be26d46a869dd7c465cbd56
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a0ee96289b7e9a06e9dbb66f40258fc09b55cde2
Log:
Commented out a few PHPDBG_IS_QUITTING checks to fix bug
If it does not work, please revert...
Changed paths:
M phpdbg_prompt.c
Diff:
diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index da06c71..0077386 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -265,13 +265,13 @@ void phpdbg_try_file_init(char *init_file, size_t init_file_len, zend_bool
free_
if (yyparse(&stack, scanner) <= 0) {
switch (phpdbg_stack_execute(&stack, &why TSRMLS_CC)) {
case FAILURE:
- if (!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)) {
+// if (!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)) {
if (phpdbg_call_register(&stack TSRMLS_CC) == FAILURE) {
phpdbg_error(
"Unrecognized command in %s:%d: %s, %s!",
init_file, line, input, why);
}
- }
+// }
break;
}
}
@@ -1046,13 +1046,13 @@ int phpdbg_interactive(TSRMLS_D) /* {{{ */
if (yyparse(&stack, scanner) <= 0) {
switch (ret = phpdbg_stack_execute(&stack, &why TSRMLS_CC)) {
case FAILURE:
- if (!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)) {
+// if (!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)) {
if (phpdbg_call_register(&stack TSRMLS_CC) == FAILURE) {
if (why) {
phpdbg_error("%s", why);
}
}
- }
+// }
if (why) {
free(why);
@@ -1254,7 +1254,7 @@ zend_vm_enter:
); \
} \
\
- do { \
+/* do { */\
switch (phpdbg_interactive(TSRMLS_C)) { \
case PHPDBG_LEAVE: \
case PHPDBG_FINISH: \
@@ -1263,7 +1263,7 @@ zend_vm_enter:
goto next; \
} \
} \
- } while (!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)); \
+/* } while (!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)); */\
} while (0)
/* allow conditional breakpoints and