archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

use tsrm_shutdown

Browse source
This commit is contained in:
krakjoe 2013-11-25 22:19:21 +00:00
parent bd87039a91
commit 01181d194f
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
phpdbg.c
View file

@ -162,6 +162,7 @@ static PHP_RSHUTDOWN_FUNCTION(phpdbg) /* {{{ */
if (PHPDBG_G(prompt)[0]) { if (PHPDBG_G(prompt)[0]) {
free(PHPDBG_G(prompt)[0]); free(PHPDBG_G(prompt)[0]);
} }
if (PHPDBG_G(prompt)[1]) { if (PHPDBG_G(prompt)[1]) {
free(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 */ setmode(_fileno(stderr), O_BINARY); /* make the stdio mode be binary */
#endif #endif
phpdbg_main:
#ifdef ZTS #ifdef ZTS
tsrm_startup(1, 1, 0, NULL); tsrm_startup(1, 1, 0, NULL);
tsrm_ls = ts_resource(0); tsrm_ls = ts_resource(0);
#endif #endif
phpdbg_main:
ini_entries = NULL; ini_entries = NULL;
ini_entries_len = 0; ini_entries_len = 0;
ini_ignore = 0; ini_ignore = 0;
@ -847,14 +848,14 @@ phpdbg_out:
sapi_shutdown(); sapi_shutdown();
} }
#ifdef ZTS
/* bugggy */
tsrm_shutdown();
#endif
if (cleaning) { if (cleaning) {
goto phpdbg_main; goto phpdbg_main;
} }
#ifdef ZTS
/* bugggy */
/* tsrm_shutdown(); */
#endif
return 0; return 0;
} /* }}} */ } /* }}} */

2
phpdbg_help.c
View file

@ -234,7 +234,7 @@ PHPDBG_HELP(break) /* {{{ */
phpdbg_writeln(EMPTY); phpdbg_writeln(EMPTY);
phpdbg_writeln("\t%sbreak [address] 0x7ff68f570e08", phpdbg_get_prompt(TSRMLS_C)); phpdbg_writeln("\t%sbreak [address] 0x7ff68f570e08", phpdbg_get_prompt(TSRMLS_C));
phpdbg_writeln("\t%sb [a] 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(EMPTY);
phpdbg_writeln("\t%sbreak [lineno] 200", phpdbg_get_prompt(TSRMLS_C)); phpdbg_writeln("\t%sbreak [lineno] 200", phpdbg_get_prompt(TSRMLS_C));
phpdbg_writeln("\t%sb [l] 200", phpdbg_get_prompt(TSRMLS_C)); phpdbg_writeln("\t%sb [l] 200", phpdbg_get_prompt(TSRMLS_C));