diff options
author | krakjoe <joe.watkins@live.co.uk> | 2013-11-25 22:19:21 +0000 |
---|---|---|
committer | krakjoe <joe.watkins@live.co.uk> | 2013-11-25 22:19:21 +0000 |
commit | 01181d194f1a4a5a888674c46136d2cf0356843f (patch) | |
tree | da0804f6eb2420682db6d512473dec1abdd72365 /phpdbg.c | |
parent | bd87039a91990d989f4ee7bff5a5762e8f868e86 (diff) | |
download | php-git-01181d194f1a4a5a888674c46136d2cf0356843f.tar.gz |
use tsrm_shutdown
Diffstat (limited to 'phpdbg.c')
-rw-r--r-- | phpdbg.c | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -162,6 +162,7 @@ static PHP_RSHUTDOWN_FUNCTION(phpdbg) /* {{{ */ if (PHPDBG_G(prompt)[0]) { free(PHPDBG_G(prompt)[0]); } + if (PHPDBG_G(prompt)[1]) { free(PHPDBG_G(prompt)[1]); } @@ -564,13 +565,13 @@ int main(int argc, char **argv) /* {{{ */ setmode(_fileno(stderr), O_BINARY); /* make the stdio mode be binary */ #endif +phpdbg_main: #ifdef ZTS tsrm_startup(1, 1, 0, NULL); tsrm_ls = ts_resource(0); #endif -phpdbg_main: ini_entries = NULL; ini_entries_len = 0; ini_ignore = 0; @@ -847,14 +848,14 @@ phpdbg_out: sapi_shutdown(); } - if (cleaning) { - goto phpdbg_main; - } - #ifdef ZTS /* bugggy */ - /* tsrm_shutdown(); */ + tsrm_shutdown(); #endif + if (cleaning) { + goto phpdbg_main; + } + return 0; } /* }}} */ |