com php-src: Merge branch 'PHP-7.1': Zend/zend.c Zend/zend.h ext/standard/info.c

Commit: fa45f64bd87b62f655e6d99c1a088efa5772b5fe Author: Remi Collet <remi@php.net> Fri, 20 Jan 2017 17:50:09 +0100 Parents: 1f7bf2bfd63d94ddf4e28f903c692850232ef798 d6c9f91e2ef0e4278a17c0c242790f5f4433be3e Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fa45f64bd87b62f655e6d99c1a088efa5772b5fe Log: Merge branch 'PHP-7.1' * PHP-7.1: NEWS NEWS Fixed bug #73965 DTrace reported as enabled when disabled Bugs: https://bugs.php.net/73965 Changed paths: MM Zend/zend.c MM Zend/zend.h MM ext/standard/info.c Diff: diff --cc Zend/zend.c index db57f39,20a8290..bcbca56 --- a/Zend/zend.c +++ b/Zend/zend.c @@@ -54,14 -45,6 +54,15 @@@ ZEND_TSRMLS_CACHE_DEFINE( # define GLOBAL_CONSTANTS_TABLE EG(zend_constants) #endif +ZEND_API zend_utility_values zend_uv; ++ZEND_API zend_bool zend_dtrace_enabled; + +/* version information */ +static char *zend_version_info; +static uint32_t zend_version_info_length; +#define ZEND_CORE_VERSION_INFO "Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2017 Zend Technologies\n" +#define PRINT_ZVAL_INDENT 4 + /* true multithread-shared globals */ ZEND_API zend_class_entry *zend_standard_class_def = NULL; ZEND_API size_t (*zend_printf)(const char *format, ...);