com php-src: scrap using zend directly, too many leaks/bugs: phpdbg.c
| From: | Bob Weinand | Date: | Sun, 02 Feb 2014 13:29:34 +0000 |
| Subject: | com php-src: scrap using zend directly, too many leaks/bugs: phpdbg.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77089@lists.php.net to get a copy of this message | ||
Commit: e55bd70643d9e9c8b3f0a6d141dc2ca3d0ef024c
Author: krakjoe <joe.watkins@live.co.uk> Sun, 2 Feb 2014 13:29:34 +0000
Parents: 261a5305c6b3528ec45d6e185c50dbac61916dd6
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e55bd70643d9e9c8b3f0a6d141dc2ca3d0ef024c
Log:
scrap using zend directly, too many leaks/bugs
Changed paths:
M phpdbg.c
Diff:
diff --git a/phpdbg.c b/phpdbg.c
index 179424b..2a10ada 100644
--- a/phpdbg.c
+++ b/phpdbg.c
@@ -879,6 +879,7 @@ phpdbg_main:
if (!cleaning) {
#ifdef _WIN32
bp_tmp_file = malloc(L_tmpnam);
+
tmpnam(bp_tmp_file);
#else
mkstemp(bp_tmp_file);
@@ -1127,8 +1128,7 @@ phpdbg_main:
phpdbg->ini_entries = ini_entries;
if (phpdbg->startup(phpdbg) == SUCCESS) {
-
- zend_activate(TSRMLS_C);
+ php_request_startup(TSRMLS_C);
/* do not install sigint handlers for remote consoles */
/* sending SIGINT then provides a decent way of shutting down the server */
@@ -1196,20 +1196,11 @@ phpdbg_main:
/* set default prompt */
phpdbg_set_prompt(PROMPT TSRMLS_CC);
- zend_try {
- zend_activate_modules(TSRMLS_C);
- } zend_end_try();
-
if (show_banner) {
/* print blurb */
phpdbg_welcome((cleaning > 0) TSRMLS_CC);
}
- zend_try {
- /* activate globals, they can be overwritten */
- zend_activate_auto_globals(TSRMLS_C);
- } zend_end_try();
-
/* initialize from file */
PHPDBG_G(flags) |= PHPDBG_IS_INITIALIZING;
zend_try {
@@ -1279,12 +1270,6 @@ phpdbg_interact:
} zend_end_try();
} while(!cleaning && !(PHPDBG_G(flags) & PHPDBG_IS_QUITTING));
- /* this must be forced */
- CG(unclean_shutdown) = 0;
-
- /* this is just helpful */
- PG(report_memleaks) = 0;
-
phpdbg_out:
#ifndef _WIN32
if ((PHPDBG_G(flags) & PHPDBG_IS_DISCONNECTED)) {
@@ -1307,24 +1292,14 @@ phpdbg_out:
if (ini_override) {
free(ini_override);
}
+
+ /* this must be forced */
+ CG(unclean_shutdown) = 0;
+
+ /* this is just helpful */
+ PG(report_memleaks) = 0;
- if (PG(modules_activated)) {
- zend_try {
- zend_deactivate_modules(TSRMLS_C);
- } zend_end_try();
- }
-
- zend_deactivate(TSRMLS_C);
-
- zend_try {
- zend_post_deactivate_modules(TSRMLS_C);
- } zend_end_try();
-
-#ifdef ZEND_SIGNALS
- zend_try {
- zend_signal_deactivate(TSRMLS_C);
- } zend_end_try();
-#endif
+ php_request_shutdown((void*)0);
zend_try {
php_module_shutdown(TSRMLS_C);