com php-src: nope: phpdbg.c
| From: | Bob Weinand | Date: | Mon, 25 Nov 2013 23:02:54 +0000 |
| Subject: | com php-src: nope: phpdbg.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74590@lists.php.net to get a copy of this message | ||
Commit: 87a29a96aa4e5522b24983778a5fd2d9682e91a0
Author: krakjoe <joe.watkins@live.co.uk> Mon, 25 Nov 2013 23:02:54 +0000
Parents: 017beb002bc3a69b9723f4702e93b1b06526eec8
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=87a29a96aa4e5522b24983778a5fd2d9682e91a0
Log:
nope
Changed paths:
M phpdbg.c
Diff:
diff --git a/phpdbg.c b/phpdbg.c
index cebc44c..9eb1a0b 100644
--- a/phpdbg.c
+++ b/phpdbg.c
@@ -162,7 +162,6 @@ 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]);
}
@@ -565,13 +564,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;
@@ -848,13 +847,14 @@ phpdbg_out:
sapi_shutdown();
}
-#ifdef ZTS
- tsrm_shutdown();
-#endif
-
if (cleaning) {
goto phpdbg_main;
}
+#ifdef ZTS
+ /* bugggy */
+ /* tsrm_shutdown(); */
+#endif
+
return 0;
} /* }}} */