com php-src: Merge branch 'PHP-7.0' into PHP-7.1: sapi/phpdbg/phpdbg.c sapi/phpdbg/phpdbg.h sapi/phpdbg/phpdbg_prompt.c sapi/php dbg/phpdbg_prompt.h

From: Date: Sun, 02 Oct 2016 11:46:22 +0000
Subject: com php-src: Merge branch 'PHP-7.0' into PHP-7.1: sapi/phpdbg/phpdbg.c sapi/phpdbg/phpdbg.h sapi/phpdbg/phpdbg_prompt.c sapi/php dbg/phpdbg_prompt.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-94816@lists.php.net to get a copy of this message
Commit: f58cf8b24dc01d79a07035a794531bedc1b0b3f3 Author: Bob Weinand <bobwei9@hotmail.com> Sun, 2 Oct 2016 12:46:22 +0100 Parents: 3fe1010ceebe231afcee8aceae6782c18da23539 417a8ef6b45ed8510faf5ebfb7b4f8c76cb97934 Branches: PHP-7.1 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f58cf8b24dc01d79a07035a794531bedc1b0b3f3 Log: Merge branch 'PHP-7.0' into PHP-7.1 Changed paths: MM sapi/phpdbg/phpdbg.c MM sapi/phpdbg/phpdbg.h MM sapi/phpdbg/phpdbg_prompt.c MM sapi/phpdbg/phpdbg_prompt.h Diff: diff --cc sapi/phpdbg/phpdbg.c index 0e891f3,618a72f..5a1bd3a --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@@ -2030,8 -2026,20 +2043,11 @@@ phpdbg_out if (PHPDBG_G(prompt)[1]) { free(PHPDBG_G(prompt)[1]); } + if (PHPDBG_G(cur_command)) { + free(PHPDBG_G(cur_command)); + } } - /* hack to restore mm_heap->use_custom_heap in order to receive memory leak info */ - if (use_mm_wrappers) { - /* ASSUMING that mm_heap->use_custom_heap is the first element of the struct ... */ - *(int *) mm_heap = 0; - } - zend_try { - php_request_shutdown(NULL); - } zend_end_try(); - if (exit_status == 0) { exit_status = EG(exit_status); }

« previous php.cvs (#94816) next »