From: krakjoe <joe.watkins@live.co.uk>
Date: Mon, 25 Nov 2013 23:03:52 +0000 (+0000)
Subject: Merge branch 'master' of https://github.com/krakjoe/phpdbg
X-Git-Tag: php-5.6.0alpha1~110^2~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=feaec0ec7304451de17230afa04a75b13bb4083a;p=php

Merge branch 'master' of https://github.com/krakjoe/phpdbg
---

feaec0ec7304451de17230afa04a75b13bb4083a
diff --cc phpdbg.c
index 9eb1a0b32e,275d91a795..3ad12968b1
--- 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;
  } /* }}} */