Merge branch 'PHP-7.1'

* PHP-7.1:
  NEWS
  NEWS
  Fixed bug #73965 DTrace reported as enabled when disabled

diff --cc Zend/zend.c
index db57f395bb91db82cf22bd7610459883355cb47d,20a82902c6c4a715a511399461ccff935c02d955..bcbca562b198b08cb0860696e25cf455d743e719
--- 1/Zend/zend.c
--- 2/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, ...);

diff --cc Zend/zend.h
Simple merge

diff --cc ext/standard/info.c
Simple merge