Commit: e71766273077cff6bb8836a37e0d199f4564c612 Author: krakjoe <joe.watk...@live.co.uk> Wed, 20 Nov 2013 14:25:15 +0000 Parents: 4f5c7a963c2f653e45ed6d8de390ac228c28138d Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e71766273077cff6bb8836a37e0d199f4564c612 Log: fix eval for new input handling Changed paths: M phpdbg_prompt.c Diff: diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c index 10fb60a..c69c056 100644 --- a/phpdbg_prompt.c +++ b/phpdbg_prompt.c @@ -514,12 +514,26 @@ static PHPDBG_COMMAND(eval) /* {{{ */ case STR_PARAM: { zend_bool stepping = (PHPDBG_G(flags) & PHPDBG_IS_STEPPING); zval retval; - + char *code = NULL; + PHPDBG_G(flags) &= ~ PHPDBG_IS_STEPPING; + if (input && input->start) { + code = (char*) input->start; + + if (memcmp( + code, "eval", sizeof("eval")-1) == SUCCESS) { + code += sizeof("eval")-1; + } else code += sizeof("E")-1; + + while (code && isspace(*code)) { + code++; + } + } else code = param->str; + /* disable stepping while eval() in progress */ PHPDBG_G(flags) |= PHPDBG_IN_EVAL; - if (zend_eval_stringl(param->str, param->len, + if (zend_eval_stringl(code, strlen(code), &retval, "eval()'d code" TSRMLS_CC) == SUCCESS) { zend_print_zval_r( &retval, 0 TSRMLS_CC); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
