From: Remi Collet <remi@php.net>
Date: Fri, 20 Jan 2017 16:50:09 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~496
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa45f64bd87b62f655e6d99c1a088efa5772b5fe;p=php

Merge branch 'PHP-7.1'

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

fa45f64bd87b62f655e6d99c1a088efa5772b5fe
diff --cc Zend/zend.c
index db57f395bb,20a82902c6..bcbca562b1
--- 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, ...);