com php-src: Merge branch 'master' of https://github.com/krakjoe/phpdbg: phpdbg.c
| From: | Bob Weinand | Date: | Mon, 25 Nov 2013 23:03:52 +0000 |
| Subject: | com php-src: Merge branch 'master' of https://github.com/krakjoe/phpdbg: phpdbg.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74593@lists.php.net to get a copy of this message | ||
Commit: feaec0ec7304451de17230afa04a75b13bb4083a
Author: krakjoe <joe.watkins@live.co.uk> Mon, 25 Nov 2013 23:03:52 +0000
Parents: 87a29a96aa4e5522b24983778a5fd2d9682e91a0 b5b5bba49245c38be6e9db885ee03500d5ceec6d
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=feaec0ec7304451de17230afa04a75b13bb4083a
Log:
Merge branch 'master' of https://github.com/krakjoe/phpdbg
Changed paths:
MM phpdbg.c
Diff:
diff --cc phpdbg.c
index 9eb1a0b,275d91a..3ad1296
--- a/phpdbg.c
+++ b/phpdbg.c
@@@ -570,7 -573,14 +571,14 @@@ int main(int argc, char **argv) /* {{{
tsrm_ls = ts_resource(0);
#endif
+phpdbg_main:
+ if (!cleaning) {
+ bp_tmp_file = malloc(L_tmpnam);
+ tmpnam(bp_tmp_file);
+ if (bp_tmp_file == NULL) {
+ phpdbg_error("Unable to create temporary file");
+ }
+ }
-
ini_entries = NULL;
ini_entries_len = 0;
ini_ignore = 0;
@@@ -851,10 -869,7 +863,12 @@@ phpdbg_out
goto phpdbg_main;
}
+#ifdef ZTS
+ /* bugggy */
+ /* tsrm_shutdown(); */
+#endif
++
+ free(bp_tmp_file);
return 0;
} /* }}} */