Browse Source

Fixed bug #73965 DTrace reported as enabled when disabled

pull/2325/head
Remi Collet 9 years ago
parent
commit
f81b7df618
  1. 2
      Zend/zend.c
  2. 2
      Zend/zend.h
  3. 2
      ext/standard/info.c

2
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;

2
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)

2
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

Loading…
Cancel
Save