Merge branch 'PHP-7.4'

author Dmitry Stogov <dmitry@zend.com>

Mon, 22 Apr 2019 11:29:58 +0000 (14:29 +0300)

committer Dmitry Stogov <dmitry@zend.com>

Mon, 22 Apr 2019 11:29:58 +0000 (14:29 +0300)
author Dmitry Stogov <dmitry@zend.com>
Mon, 22 Apr 2019 11:29:58 +0000 (14:29 +0300)
committer Dmitry Stogov <dmitry@zend.com>
Mon, 22 Apr 2019 11:29:58 +0000 (14:29 +0300)
diff --cc Zend/Zend.m4
Simple merge
diff --cc Zend/zend_execute.c
Simple merge
author	Dmitry Stogov <dmitry@zend.com>
	Mon, 22 Apr 2019 11:29:58 +0000 (14:29 +0300)
committer	Dmitry Stogov <dmitry@zend.com>
	Mon, 22 Apr 2019 11:29:58 +0000 (14:29 +0300)
		1	2
Zend/Zend.m4	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_execute.c	patch \|	diff1 \|	diff2 \|	blob \| history