Merge branch 'PHP-7.0' into PHP-7.1

2 files changed, 6 insertions, 8 deletions

diff --git a/sapi/phpdbg/phpdbg_help.c b/sapi/phpdbg/phpdbg_help.c
index 40716299d4..a3bcbd10a1 100644
--- a/sapi/phpdbg/phpdbg_help.c
+++ b/sapi/phpdbg/phpdbg_help.c
@@ -829,21 +829,19 @@ phpdbg_help_text_t phpdbg_help_text[] = {
 
 {"run",
 "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
 
 "    $P run" CR
 "    $P r" CR
 "    Will cause execution of the context, if it is set" CR CR
-"    $P r test" CR
-"    Will execute with $argv[1] == \"test\"" CR CR
+"    $P r test < foo.txt" 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 "
-"be compiled before execution." CR CR
-
-"Note that attempting to run a script that is already executing will result in an \"execution "
-"in progress\" error."
+"be compiled before execution."
 },
 
 {"set",
diff --git a/sapi/phpdbg/phpdbg_list.c b/sapi/phpdbg/phpdbg_list.c
index a1403dbc30..dd0187cfbe 100644
--- a/sapi/phpdbg/phpdbg_list.c
+++ b/sapi/phpdbg/phpdbg_list.c
@@ -319,7 +319,7 @@ zend_op_array *phpdbg_init_compile_file(zend_file_handle *file, int type) {
 
 	if (op_array->vars) {
 		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++) {
 			zend_string **s = op_array->vars + i;
 			if (ZSTR_IS_INTERNED(*s)) {