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 /Zend/zend.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 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 2 |
1 files changed, 2 insertions, 0 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; |