wez Mon Dec 22 08:08:05 2003 EDT
Modified files:
/php-src/sapi/cli config.w32 php_cli.c
Log:
add win32 configure option for CLI to switch on CRT heap debugging
Index: php-src/sapi/cli/config.w32
diff -u php-src/sapi/cli/config.w32:1.1 php-src/sapi/cli/config.w32:1.2
--- php-src/sapi/cli/config.w32:1.1 Tue Dec 2 18:17:03 2003
+++ php-src/sapi/cli/config.w32 Mon Dec 22 08:08:04 2003
@@ -1,9 +1,13 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.1 2003/12/02 23:17:03 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/22 13:08:04 wez Exp $
ARG_ENABLE('cli', 'Build CLI version of PHP', 'yes');
+ARG_ENABLE('crt-debug', 'Extra CRT debugging', 'no');
if (PHP_CLI == "yes") {
SAPI('cli', 'getopt.c php_cli.c', 'php.exe');
+ if (PHP_CRT_DEBUG == "yes") {
+ ADD_FLAG("CFLAGS_CLI", "/D PHP_WIN32_DEBUG_HEAP");
+ }
}
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.103 php-src/sapi/cli/php_cli.c:1.104
--- php-src/sapi/cli/php_cli.c:1.103 Thu Dec 11 18:51:24 2003
+++ php-src/sapi/cli/php_cli.c Mon Dec 22 08:08:04 2003
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c,v 1.103 2003/12/11 23:51:24 iliaa Exp $ */
+/* $Id: php_cli.c,v 1.104 2003/12/22 13:08:04 wez Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -537,6 +537,20 @@
void ***tsrm_ls;
#endif
+#if defined(PHP_WIN32) && defined(_DEBUG) && defined(PHP_WIN32_DEBUG_HEAP)
+ {
+ int tmp_flag;
+
+ _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE);
+ _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);
+
+ tmp_flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
+ tmp_flag |= _CRTDBG_DELAY_FREE_MEM_DF;
+ tmp_flag |= _CRTDBG_LEAK_CHECK_DF;
+
+ _CrtSetDbgFlag(tmp_flag);
+ }
+#endif
#ifdef HAVE_SIGNAL_H
#if defined(SIGPIPE) && defined(SIG_IGN)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
