Fixed bug #73965 DTrace reported as enabled when disabled

diff --git a/Zend/zend.c b/Zend/zend.c
index 2a47e9244ba787a2ad35e9220171b04d1a5de634..22a92a6a0a724104abf6adaa2bacef461c59bf4c 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -152,6 +152,7 @@ ZEND_TSRMLS_CACHE_DEFINE()
 #endif
 
 ZEND_API zend_utility_values zend_uv;
+ZEND_API zend_bool zend_dtrace_enabled;
 
 /* version information */
 static char *zend_version_info;
@@ -685,6 +686,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions) /
                char *tmp = getenv("USE_ZEND_DTRACE");
 
                if (tmp && zend_atoi(tmp, 0)) {
+                       zend_dtrace_enabled = 1;
                        zend_compile_file = dtrace_compile_file;
                        zend_execute_ex = dtrace_execute_ex;
                        zend_execute_internal = dtrace_execute_internal;

diff --git a/Zend/zend.h b/Zend/zend.h
index 141573fdecf952fd8c6c31f6d83f01d584b2bded..bb9866ddd03b5f5b809e19065e674ae31480d006 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -299,6 +299,8 @@ extern ZEND_API zend_class_entry *zend_standard_class_def;
 extern ZEND_API zend_utility_values zend_uv;
 extern ZEND_API zval zval_used_for_init;
 
+/* If DTrace is available and enabled */
+extern ZEND_API zend_bool zend_dtrace_enabled;
 END_EXTERN_C()
 
 #define ZEND_UV(name) (zend_uv.name)

diff --git a/ext/standard/info.c b/ext/standard/info.c
index fa19179986721bf4c9f6b15c5620a10e6599c545..6b06f02e4178e55e0f28ae9ded046fd18f5c5f35 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -940,7 +940,7 @@ PHPAPI void php_print_info(int flag)
 #endif
 
 #if HAVE_DTRACE
-               php_info_print_table_row(2, "DTrace Support", "enabled" );
+               php_info_print_table_row(2, "DTrace Support", (zend_dtrace_enabled ? "enabled" : "available, disabled"));
 #else
                php_info_print_table_row(2, "DTrace Support", "disabled" );
 #endif