archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.0' into PHP-7.1

Browse source
This commit is contained in:
Bob Weinand 2016-10-05 12:20:06 +02:00
commit abfd811ea4
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sapi/phpdbg/phpdbg_help.c
View file

@ -829,21 +829,19 @@ phpdbg_help_text_t phpdbg_help_text[] = {
{"run", {"run",
"Enter the vm, starting execution. Execution will then continue until the next breakpoint " "Enter the vm, starting execution. Execution will then continue until the next breakpoint "
"or completion of the script. Add parameters you want to use as $argv" CR CR "or completion of the script. Add parameters you want to use as $argv. Add a trailing "
"**< filename** for reading STDIN from a file." CR CR
"**Examples**" CR CR "**Examples**" CR CR
" $P run" CR " $P run" CR
" $P r" CR " $P r" CR
" Will cause execution of the context, if it is set" CR CR " Will cause execution of the context, if it is set" CR CR
" $P r test" CR " $P r test < foo.txt" CR
" Will execute with $argv[1] == \"test\"" CR CR " Will execute with $argv[1] == \"test\" and read from the foo.txt file for STDIN" CR CR
"Note that the execution context must be set. If not previously compiled, then the script will " "Note that the execution context must be set. If not previously compiled, then the script will "
"be compiled before execution." CR CR "be compiled before execution."
"Note that attempting to run a script that is already executing will result in an \"execution "
"in progress\" error."
}, },
{"set", {"set",

2
sapi/phpdbg/phpdbg_list.c
View file

@ -319,7 +319,7 @@ zend_op_array *phpdbg_init_compile_file(zend_file_handle *file, int type) {
if (op_array->vars) { if (op_array->vars) {
int i; int i;
/* un-intern these strings to prevent zend_restore_strings from invalidating our string pointers too early */ /* un-intern these strings to prevent zend_interned_strings_restore from invalidating our string pointers too early (in phpdbg allocated memory only gets freed after module shutdown) */
for (i = 0; i < op_array->last_var; i++) { for (i = 0; i < op_array->last_var; i++) {
zend_string **s = op_array->vars + i; zend_string **s = op_array->vars + i;
if (ZSTR_IS_INTERNED(*s)) { if (ZSTR_IS_INTERNED(*s)) {