diff options
| author | Remi Collet <remi@php.net> | 2017-01-20 17:46:24 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-01-20 17:46:24 +0100 |
| commit | 7ea7d3d829784c3b69c4fe227bcdff8e724e8391 (patch) | |
| tree | 308136e6e0be0df4ff2c9ab5d7b7ead1216835a1 | |
| parent | 631861e1fa93b19788def94cf456d2993551c17f (diff) | |
| parent | 2e3d68ed1ba9097d1b8ac64c2a5af7004faa2796 (diff) | |
| download | php-git-7ea7d3d829784c3b69c4fe227bcdff8e724e8391.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
NEWS
Fixed bug #73965 DTrace reported as enabled when disabled
| -rw-r--r-- | Zend/zend.c | 2 | ||||
| -rw-r--r-- | Zend/zend.h | 2 | ||||
| -rw-r--r-- | ext/standard/info.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 7f37e28500..20a82902c6 100644 --- 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; @@ -696,6 +697,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 d01017f3a9..18c7ea9e7d 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -281,6 +281,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 35c24875c3..76802fa842 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -942,7 +942,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 |