summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2018-06-22 16:22:50 +0200
committerNikita Popov <nikita.ppv@gmail.com>2018-06-22 16:23:25 +0200
commitb592cd7b989a8d49ec505237e08dca0f19e3cad6 (patch)
tree9849d0569b341f235f96d82257c0d718ff100de5
parent8b58b2aac696755fb15e17ee4861411ef8e346bc (diff)
parented9d1b708bb83d4819648815a35da96be38ef437 (diff)
downloadphp-git-b592cd7b989a8d49ec505237e08dca0f19e3cad6.tar.gz
Merge branch 'PHP-7.2'
-rw-r--r--NEWS4
-rw-r--r--Zend/zend_execute_API.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 6f510ec6b5..673ec9b29d 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 7.3.0alpha3
+- Core:
+ . Fixed bug #76520 (Object creation leaks memory when executed over HTTP).
+ (Nikita)
+
- FPM:
. Fixed bug #73342 (Vulnerability in php-fpm by changing stdin to
non-blocking). (Nikita)
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index e7a96af743..01f6fbf4a9 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -142,6 +142,7 @@ void init_executor(void) /* {{{ */
EG(in_autoload) = NULL;
EG(autoload_func) = NULL;
EG(error_handling) = EH_NORMAL;
+ EG(flags) = EG_FLAGS_INITIAL;
zend_vm_stack_init();