archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.0' into PHP-7.1

Browse source 
* PHP-7.0:
  NEWS
  Fixed bug #73965 DTrace reported as enabled when disabled
This commit is contained in:
Remi Collet 2017-01-20 17:46:24 +01:00
commit 7ea7d3d829
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/zend.c
View file

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

2
Zend/zend.h
View file

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

2
ext/standard/info.c
View file

@ -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