cvs: php4 / php.ini-dist php.ini-recommended /main main.c php_globals.h

derick Wed Jun 26 15:43:47 2002 EDT Modified files: /php4 php.ini-dist php.ini-recommended /php4/main php_globals.h main.c Log: - Implement Andrei's request for disabling memory leak reporting in debug builds. #- Andrei: I can show you the logs :) Index: php4/php.ini-dist diff -u php4/php.ini-dist:1.130 php4/php.ini-dist:1.131 --- php4/php.ini-dist:1.130 Sun Jun 16 02:05:21 2002 +++ php4/php.ini-dist Wed Jun 26 15:43:46 2002 @@ -270,6 +270,11 @@ ; sourcelines. ignore_repeated_source = Off +; If this parameter is set to Off, then memory leaks will not be shown (on +; stdout or in the log). This has only effect in a debug compile, and if +; error reporting includes E_WARNING in the allowed list +report_memleaks = On + ; Store the last error/warning message in $php_errormsg (boolean). track_errors = Off Index: php4/php.ini-recommended diff -u php4/php.ini-recommended:1.83 php4/php.ini-recommended:1.84 --- php4/php.ini-recommended:1.83 Sun Jun 16 02:05:23 2002 +++ php4/php.ini-recommended Wed Jun 26 15:43:46 2002 @@ -275,6 +275,11 @@ ; sourcelines. ignore_repeated_source = Off +; If this parameter is set to Off, then memory leaks will not be shown (on +; stdout or in the log). This has only effect in a debug compile, and if +; error reporting includes E_WARNING in the allowed list +report_memleaks = On + ; Store the last error/warning message in $php_errormsg (boolean). track_errors = Off Index: php4/main/php_globals.h diff -u php4/main/php_globals.h:1.77 php4/main/php_globals.h:1.78 --- php4/main/php_globals.h:1.77 Tue Apr 9 21:27:44 2002 +++ php4/main/php_globals.h Wed Jun 26 15:43:46 2002 @@ -79,6 +79,7 @@ int log_errors_max_len; zend_bool ignore_repeated_errors; zend_bool ignore_repeated_source; + zend_bool report_memleaks; char *error_log; char *doc_root; Index: php4/main/main.c diff -u php4/main/main.c:1.460 php4/main/main.c:1.461 --- php4/main/main.c:1.460 Sat Jun 22 20:57:01 2002 +++ php4/main/main.c Wed Jun 26 15:43:46 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.460 2002/06/23 00:57:01 helly Exp $ */ +/* $Id: main.c,v 1.461 2002/06/26 19:43:46 derick Exp $ */ /* {{{ includes */ @@ -242,6 +242,7 @@ STD_PHP_INI_ENTRY("log_errors_max_len", "1024", PHP_INI_ALL, OnUpdateInt, log_errors_max_len, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("ignore_repeated_errors", "0", PHP_INI_ALL, OnUpdateBool, ignore_repeated_errors, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("ignore_repeated_source", "0", PHP_INI_ALL, OnUpdateBool, ignore_repeated_source, php_core_globals, core_globals) + STD_PHP_INI_BOOLEAN("report_memleaks", "1", PHP_INI_SYSTEM, OnUpdateBool, report_memleaks, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("magic_quotes_gpc", "1", PHP_INI_ALL, OnUpdateBool, magic_quotes_gpc, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("magic_quotes_runtime", "0", PHP_INI_ALL, OnUpdateBool, magic_quotes_runtime, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("magic_quotes_sybase", "0", PHP_INI_ALL, OnUpdateBool, magic_quotes_sybase, php_core_globals, core_globals) @@ -609,7 +610,7 @@ case ZMSG_MEMORY_LEAK_REPEATED: { TSRMLS_FETCH(); - if (EG(error_reporting)&E_WARNING) { + if ((EG(error_reporting)&E_WARNING) && PG(report_memleaks)) { #if ZEND_DEBUG char memory_leak_buf[512];