com php-src: use tsrm_shutdown: phpdbg.c phpdbg_hel p.c
| From: | Bob Weinand | Date: | Mon, 25 Nov 2013 22:19:21 +0000 |
| Subject: | com php-src: use tsrm_shutdown: phpdbg.c phpdbg_hel p.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74591@lists.php.net to get a copy of this message | ||
Commit: 01181d194f1a4a5a888674c46136d2cf0356843f
Author: krakjoe <joe.watkins@live.co.uk> Mon, 25 Nov 2013 22:19:21 +0000
Parents: bd87039a91990d989f4ee7bff5a5762e8f868e86
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=01181d194f1a4a5a888674c46136d2cf0356843f
Log:
use tsrm_shutdown
Changed paths:
M phpdbg.c
M phpdbg_help.c
Diff:
diff --git a/phpdbg.c b/phpdbg.c
index 9eb1a0b..4fff0c7 100644
--- a/phpdbg.c
+++ b/phpdbg..c
@@ -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;
} /* }}} */
diff --git a/phpdbg_help.c b/phpdbg_help..c
index c9598a7..650025b 100644
--- a/phpdbg_help.c
+++ b/phpdbg_help.c
@@ -234,7 +234,7 @@ PHPDBG_HELP(break) /* {{{ */
phpdbg_writeln(EMPTY);
phpdbg_writeln("\t%sbreak [address] 0x7ff68f570e08", phpdbg_get_prompt(TSRMLS_C));
phpdbg_writeln("\t%sb [a] 0x7ff68f570e08", phpdbg_get_prompt(TSRMLS_C));
- phpdbg_writeln("\tWill break at the opline with the address provided (addresses are shown
during execution)");
+ phpdbg_writeln("\tWill break at the opline with the address provided");
phpdbg_writeln(EMPTY);
phpdbg_writeln("\t%sbreak [lineno] 200", phpdbg_get_prompt(TSRMLS_C));
phpdbg_writeln("\t%sb [l] 200", phpdbg_get_prompt(TSRMLS_C));