com php-src: Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1: sapi/phpdbg/phpdbg.c

Commit: 457e68626257e8b5c891f2edf20d31907080063a Author: Bob Weinand <bobwei9@hotmail.com> Wed, 12 Oct 2016 22:57:41 +0200 Parents: 9669ec707ab99d33404d3132792a24ebd1130fcf fe49fd7daddd740d84601504fe55dbc33c858d4c Branches: PHP-7.1 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=457e68626257e8b5c891f2edf20d31907080063a Log: Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1 Changed paths: MM sapi/phpdbg/phpdbg.c Diff: diff --cc sapi/phpdbg/phpdbg.c index be50de8,fda8962..301e55c --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@@ -2058,10 -2040,12 +2058,16 @@@ phpdbg_out zend_objects_store_mark_destructed(&EG(objects_store)); } + zend_try { + 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));