com php-src: merge master: phpdbg_prompt.c

From: Date: Sun, 13 Apr 2014 07:09:53 +0000
Subject: com php-src: merge master: phpdbg_prompt.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-77007@lists.php.net to get a copy of this message
Commit: 65984df220c494e431fa148f437115ca02cb7d39 Author: krakjoe <joe.watkins@live.co.uk> Sun, 13 Apr 2014 08:09:53 +0100 Parents: ef86b57f3b6745d5215e1316512c108f46df8668 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=65984df220c494e431fa148f437115ca02cb7d39 Log: merge master Changed paths: M phpdbg_prompt.c Diff: diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c index 3010c08..373260c 100644 --- a/phpdbg_prompt.c +++ b/phpdbg_prompt.c @@ -356,7 +356,6 @@ PHPDBG_COMMAND(exec) /* {{{ */ if ((res_len != PHPDBG_G(exec_len)) || (memcmp(res, PHPDBG_G(exec), res_len) != SUCCESS)) { -<<<<<<< HEAD if (PHPDBG_G(exec)) { phpdbg_notice("Unsetting old execution context: %s", PHPDBG_G(exec)); efree(PHPDBG_G(exec)); @@ -367,21 +366,13 @@ PHPDBG_COMMAND(exec) /* {{{ */ if (PHPDBG_G(ops)) { phpdbg_notice("Destroying compiled opcodes"); phpdbg_clean(0 TSRMLS_CC); -======= - *SG(request_info).argv = PHPDBG_G(exec); - php_hash_environment(TSRMLS_C); - - phpdbg_notice("Set execution context: %s", PHPDBG_G(exec)); - } else { - phpdbg_notice("Execution context not changed"); - } - } else { - phpdbg_error("Cannot use %s as execution context, not a valid file or symlink", param->str); ->>>>>>> 3db29ee43960a4e164244a55b0e2a4b23a112e49 } PHPDBG_G(exec) = res; PHPDBG_G(exec_len) = res_len; + + *SG(request_info).argv = PHPDBG_G(exec); + php_hash_environment(TSRMLS_C); phpdbg_notice("Set execution context: %s", PHPDBG_G(exec)); } else {

« previous php.cvs (#77007) next »