From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 18 Nov 2016 10:21:22 +0000 (+0300)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~889^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a647150eeababb973a6218e1e372cbf65a70818;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Disabled PHP call tracing by default (it makes significant overhead). This may be enabled again using envirionment variable USE_ZEND_DTRACE=1.
---

6a647150eeababb973a6218e1e372cbf65a70818
diff --cc NEWS
index 94826541fd,5c6ed06a71..2f1ae9eab3
--- a/NEWS
+++ b/NEWS
@@@ -8,52 -8,15 +8,57 @@@ PH
  - Date:
    . Fixed bug #69587 (DateInterval properties and isset). (jhdxr)
  
+ - DTrace:
+   . Disabled PHP call tracing by default (it makes significant overhead).
+     This may be enabled again using envirionment variable USE_ZEND_DTRACE=1.
+     (Dmitry)
+ 
 +- Mbstring:
 +  . Fixed bug #73532 (Null pointer dereference in mb_eregi). (Laruence)
 +
 +- Opcache:
 +  . Fixed bug #69090 (check cached files permissions)
 +
 +- SQLite3:
 +  . Update to SQLite 3.15.1. (cmb)
 +  . Fixed bug #73530 (Unsetting result set may reset other result set). (cmb)
 +
 +- Standard:
 +   . Fixed bug #73297 (HTTP stream wrapper should ignore HTTP 100 Continue).
 +     (rowan dot collins at gmail dot com)
 +
 +- XML:
 +  . Fixed bug #72135 (malformed XML causes fault) (edgarsandi)
 +
 +10 Nov 2016, PHP 7.1.0RC6
 +
 +- Core:
 +  . Fixded bug #72736 (Slow performance when fetching large dataset with mysqli
 +    / PDO). (Dmitry)
 +  . Fixed bug #72482 (Ilegal write/read access caused by gdImageAALine
 +    overflow). (cmb)
 +  . Fixed bug #72696 (imagefilltoborder stackoverflow on truecolor images).
 +    (cmb)
 +
 +- Date:
 +  . Fixed bug #73426 (createFromFormat with 'z' format char results in
 +    incorrect time). (Derick)
 +
 +- IMAP:
 +  . Fixed bug #73418 (Integer Overflow in "_php_imap_mail" leads to crash).
 +    (Anatol)
 +
 +- Interbase:
 +  . Fixed bug #73512 (Fails to find firebird headers as don't use fb_config
 +    output). (Remi)
 +
 +- JSON:
 +  . Introduced encoder struct instead of global which fixes bugs #66025 and
 +    #73254 related to pretty print indentation. (Jakub Zelenka)
 +
 +- Date:
 +  . Fixed bug #69587 (DateInterval properties and isset). (jhdxr)
 +
  - ODBC:
    . Fixed bug #73448 (odbc_errormsg returns trash, always 513 bytes).
      (Anatol)
diff --cc Zend/zend.c
index 12801c8b70,87cdeade37..1a4af3f5d3
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@@ -689,13 -676,21 +689,23 @@@ int zend_startup(zend_utility_function
  	zend_getenv = utility_functions->getenv_function;
  	zend_resolve_path = utility_functions->resolve_path_function;
  
 +	zend_interrupt_function = NULL;
 +
  #if HAVE_DTRACE
  /* build with dtrace support */
- 	zend_compile_file = dtrace_compile_file;
- 	zend_execute_ex = dtrace_execute_ex;
- 	zend_execute_internal = dtrace_execute_internal;
+ 	{
+ 		char *tmp = getenv("USE_ZEND_DTRACE");
+ 
+ 		if (tmp && zend_atoi(tmp, 0)) {
+ 			zend_compile_file = dtrace_compile_file;
+ 			zend_execute_ex = dtrace_execute_ex;
+ 			zend_execute_internal = dtrace_execute_internal;
+ 		} else {
+ 			zend_compile_file = compile_file;
+ 			zend_execute_ex = execute_ex;
+ 			zend_execute_internal = NULL;
+ 		}
+ 	}
  #else
  	zend_compile_file = compile_file;
  	zend_execute_ex = execute_ex;