summaryrefslogtreecommitdiff
path: root/main/main.c
diff options
context:
space:
mode:
authorDerick Rethans <derick@php.net>2002-06-26 19:43:46 +0000
committerDerick Rethans <derick@php.net>2002-06-26 19:43:46 +0000
commitd812929d2f46c93a7c77cf86bcc0db1a6c293e59 (patch)
treeb126285724c9ec67fc4b357cff8407966f0a2a8b /main/main.c
parentea303541f8a0ef16f459db117020aa495b4991fe (diff)
downloadphp-git-d812929d2f46c93a7c77cf86bcc0db1a6c293e59.tar.gz
- Implement Andrei's request for disabling memory leak reporting in debug
builds. #- Andrei: I can show you the logs :)
Diffstat (limited to 'main/main.c')
-rw-r--r--main/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/main.c b/main/main.c
index 7d0b3ec0f2..28a7a73ca7 100644
--- a/main/main.c
+++ b/main/main.c
@@ -242,6 +242,7 @@ PHP_INI_BEGIN()
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 @@ static void php_message_handler_for_zend(long message, void *data)
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];