- MFH: Added the --disable-zend-memory-manager switch to disable the Zend

  memory manager.
#- I discussed this with Dmitry today - we found it useful.

diff --git a/configure.in b/configure.in
index 93ad74db4155d8c5cb59168ccc51ea3167b1be35..081aa7758fef7437d1c93f6a321772629b655455 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -659,6 +659,16 @@ else
   ZEND_DEBUG=no
 fi
 
+PHP_ARG_ENABLE(zend-memory-manager,whether to enable the Zend memory manager,
+[  --disable-zend-memory-manager
+                          Disable the Zend memory manager (DEVELOPERS ONLY)],yes, no)
+
+if test "$PHP_ZEND_MEMORY_MANAGER" = "yes"; then
+  AC_DEFINE(USE_ZEND_ALLOC, 1, [ ])
+else
+  AC_DEFINE(USE_ZEND_ALLOC, 0, [ ])
+fi
+
 PHP_ARG_WITH(layout,[layout of installed files],
 [  --with-layout=TYPE      Sets how installed files will be laid out.  Type is
                           one of "PHP" (default) or "GNU"], PHP, no)

diff --git a/ext/standard/info.c b/ext/standard/info.c
index 91f2c18df91ced23d03dc5b28ed476ff7801b502..6a80b7814301bbaef308e9796c02ce4a46502f32 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -465,6 +465,12 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
                php_info_print_table_row(2, "Debug Build", "no" );
 #endif
 
+#if USE_ZEND_ALLOC
+               php_info_print_table_row(2, "Zend Memory Manager", "enabled" );
+#else
+               php_info_print_table_row(2, "Zend Memory Manager", "disabled" );
+#endif
+
 #ifdef ZTS
                php_info_print_table_row(2, "Thread Safety", "enabled" );
 #else