Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1

bwoebi · weltling · commit f40c03168ef1 · 2016-10-14T01:54:18.000+02:00
(cherry picked from commit 457e68626257e8b5c891f2edf20d31907080063a)
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
@@ -2062,6 +2062,12 @@ int main(int argc, char **argv) /* {{{ */
 			php_request_shutdown(NULL);
 		} zend_end_try();
 
+		if (PHPDBG_G(exec) && !memcmp("-", PHPDBG_G(exec), 2)) { /* i.e. execution context has been read from stdin - back it up */
+			phpdbg_file_source *data = zend_hash_str_find_ptr(&PHPDBG_G(file_sources), PHPDBG_G(exec), PHPDBG_G(exec_len));
+			backup_phpdbg_compile = zend_string_alloc(data->len + 2, 1);
+			sprintf(ZSTR_VAL(backup_phpdbg_compile), "?>%.*s", (int) data->len, data->buf);
+		}
+
 		/* backup globals when cleaning */
 		if ((cleaning > 0 || remote) && !quit_immediately) {
 			settings = calloc(1, sizeof(zend_phpdbg_globals));
@@ -2114,12 +2120,6 @@ int main(int argc, char **argv) /* {{{ */
 			wrapper->wops->stream_opener = PHPDBG_G(orig_url_wrap_php);
 		}
 
-		if (PHPDBG_G(exec) && !memcmp("-", PHPDBG_G(exec), 2)) { /* i.e. execution context has been read from stdin - back it up */
-			phpdbg_file_source *data = zend_hash_str_find_ptr(&PHPDBG_G(file_sources), PHPDBG_G(exec), PHPDBG_G(exec_len));
-			backup_phpdbg_compile = zend_string_alloc(data->len + 2, 1);
-			sprintf(ZSTR_VAL(backup_phpdbg_compile), "?>%.*s", (int) data->len, data->buf);
-		}
-
 		zend_try {
 			php_module_shutdown();
 		} zend_end_try();
diff --git a/sapi/phpdbg/tests/include.inc b/sapi/phpdbg/tests/include.inc
@@ -0,0 +1,3 @@
+<?php
+
+echo 1;
