com php-src: Merge remote-tracking branch 'origin/PHP-5.6': sapi/phpdbg/phpdbg.c sapi/phpdbg/phpdbg.h sapi/phpdbg/phpdbg_ prompt.c
| From: | Bob Weinand | Date: | Mon, 27 Oct 2014 12:19:33 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/PHP-5.6': sapi/phpdbg/phpdbg.c sapi/phpdbg/phpdbg.h sapi/phpdbg/phpdbg_ prompt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82697@lists.php.net to get a copy of this message | ||
Commit: a3ae40152490eacdced73408b9978c8ba31d0179
Author: Bob Weinand <bobwei9@hotmail.com> Mon, 27 Oct 2014 13:19:33 +0100
Parents: 2233625e02374339a7d10876b353c158fa39a5f9 6eab2b910120e0ff5f0cdbbeac9be02e13312497
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a3ae40152490eacdced73408b9978c8ba31d0179
Log:
Merge remote-tracking branch 'origin/PHP-5.6'
Changed paths:
MM sapi/phpdbg/phpdbg.c
MM sapi/phpdbg/phpdbg.h
MM sapi/phpdbg/phpdbg_prompt.c
Diff:
diff --cc sapi/phpdbg/phpdbg_prompt.c
index 7ce0cea,73ecbcb..16807c6
--- a/sapi/phpdbg/phpdbg_prompt.c
+++ b/sapi/phpdbg/phpdbg_prompt.c
@@@ -608,13 -644,19 +608,17 @@@ PHPDBG_COMMAND(run) /* {{{ *
}
zend_try {
- PHPDBG_G(flags) &= ~PHPDBG_IS_INTERACTIVE;
+ PHPDBG_G(flags) ^= PHPDBG_IS_INTERACTIVE;
PHPDBG_G(flags) |= PHPDBG_IS_RUNNING;
- zend_execute(EG(active_op_array) TSRMLS_CC);
- PHPDBG_G(flags) |= PHPDBG_IS_INTERACTIVE;
+ zend_execute(PHPDBG_G(ops), &PHPDBG_G(retval) TSRMLS_CC);
+ PHPDBG_G(flags) ^= PHPDBG_IS_INTERACTIVE;
} zend_catch {
- EG(active_op_array) = orig_op_array;
- EG(opline_ptr) = orig_opline;
- EG(return_value_ptr_ptr) = orig_retval_ptr;
+ PHPDBG_G(in_execution) = 0;
+ if (PHPDBG_G(flags) & PHPDBG_IS_QUITTING) {
+ zend_bailout();
+ }
+
if (!(PHPDBG_G(flags) & PHPDBG_IS_STOPPING)) {
phpdbg_error("stop", "type=\"bailout\"", "Caught exit/error
from VM");
restore = 0;
@@@ -1303,14 -1423,27 +1308,14 @@@ void phpdbg_clean(zend_bool full TSRMLS
} \
} while (0)
-#if PHP_VERSION_ID >= 50500
void phpdbg_execute_ex(zend_execute_data *execute_data TSRMLS_DC) /* {{{ */
{
-#else
-void phpdbg_execute_ex(zend_op_array *op_array TSRMLS_DC) /* {{{ */
-{
- long long flags = 0;
- zend_ulong address = 0L;
- zend_execute_data *execute_data;
- zend_bool nested = 0;
-#endif
- zend_bool original_in_execution = EG(in_execution);
+ zend_bool original_in_execution = PHPDBG_G(in_execution);
HashTable vars;
-#if PHP_VERSION_ID < 50500
- if (EG(exception)) {
- return;
- }
-#endif
+ zend_hash_init(&vars, execute_data->func->op_array.last, NULL, NULL, 0);
- if ((PHPDBG_G(flags) & (PHPDBG_IS_STOPPING | PHPDBG_IS_RUNNING)) == PHPDBG_IS_STOPPING) {
+ if ((PHPDBG_G(flags) & PHPDBG_IS_STOPPING) && !(PHPDBG_G(flags) &
PHPDBG_IS_RUNNING)) {
zend_bailout();
}