Commitabfd811

committed

Merge branch 'PHP-7.0' into PHP-7.1

2 parentscc2a0dd +4790da5 commitabfd811Copy full SHA for abfd811

File tree

-8

lines changed

-8

lines changed

Lines changed: 5 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -829,21 +829,19 @@ phpdbg_help_text_t phpdbg_help_text[] = {`
`829`	`829`
`830`	`830`	`{"run",`
`831`	`831`	`"Enter the vm, starting execution. Execution will then continue until the next breakpoint "`
`832`		`-"or completion of the script. Add parameters you want to use as $argv"CRCR`
	`832`	`+"or completion of the script. Add parameters you want to use as $argv. Add a trailing "`
	`833`	`+"< filename for reading STDIN from a file."CRCR`
`833`	`834`
`834`	`835`	`"Examples"CRCR`
`835`	`836`
`836`	`837`	`" $P run"CR`
`837`	`838`	`" $P r"CR`
`838`	`839`	`" Will cause execution of the context, if it is set"CRCR`
`839`		`-" $P r test"CR`
`840`		`-" Will execute with $argv[1] == \"test\""CRCR`
	`840`	`+" $P r test < foo.txt"CR`
	`841`	`+" Will execute with $argv[1] == \"test\" and read from the foo.txt file for STDIN"CRCR`
`841`	`842`
`842`	`843`	`"Note that the execution context must be set. If not previously compiled, then the script will "`
`843`		`-"be compiled before execution."CRCR`
`844`		`-`
`845`		`-"Note that attempting to run a script that is already executing will result in an \"execution "`
`846`		`-"in progress\" error."`
	`844`	`+"be compiled before execution."`
`847`	`845`	`},`
`848`	`846`
`849`	`847`	`{"set",`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ zend_op_array phpdbg_init_compile_file(zend_file_handle file, int type) {`
`319`	`319`
`320`	`320`	`if (op_array->vars) {`
`321`	`321`	`inti;`
`322`		`-/* un-intern these strings to preventzend_restore_strings from invalidating our string pointers too early */`
	`322`	`+/* un-intern these strings to preventzend_interned_strings_restore from invalidating our string pointers too early (in phpdbg allocated memory only gets freed after module shutdown) */`
`323`	`323`	`for (i=0;i<op_array->last_var;i++) {`
`324`	`324`	`zend_string**s=op_array->vars+i;`
`325`	`325`	`if (ZSTR_IS_INTERNED(*s)) {`

Comments

(0)