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

(cherry picked from commit 457e68626257e8b5c891f2edf20d31907080063a)

diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index f4b427330236ca81d2176665d896acf568d8a8fe..361b2c5bc176efd0a83e4bc0563040260f53367b 100644 (file)
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@ -2062,6 +2062,12 @@ phpdbg_out:
                        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 @@ phpdbg_out:
                        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
new file mode 100644 (file)
index 0000000..fb1b7ca
--- /dev/null
+++ b/sapi/phpdbg/tests/include.inc
@@ -0,0 +1,3 @@
+<?php
+
+echo 1;