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 /ext/standard/info.c | |
| 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
Diffstat (limited to 'ext/standard/info.c')
| -rw-r--r-- | ext/standard/info.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |