Merge branch 'master' of git.php.net:php-src

author Dmitry Stogov <dmitry@zend.com>

Tue, 15 Jan 2019 23:30:15 +0000 (02:30 +0300)

committer Dmitry Stogov <dmitry@zend.com>

Tue, 15 Jan 2019 23:30:15 +0000 (02:30 +0300)
author Dmitry Stogov <dmitry@zend.com>
Tue, 15 Jan 2019 23:30:15 +0000 (02:30 +0300)
committer Dmitry Stogov <dmitry@zend.com>
Tue, 15 Jan 2019 23:30:15 +0000 (02:30 +0300)
diff --cc Zend/zend_vm_def.h
Simple merge
diff --cc Zend/zend_vm_execute.h
Simple merge
author	Dmitry Stogov <dmitry@zend.com>
	Tue, 15 Jan 2019 23:30:15 +0000 (02:30 +0300)
committer	Dmitry Stogov <dmitry@zend.com>
	Tue, 15 Jan 2019 23:30:15 +0000 (02:30 +0300)
		1	2
Zend/zend_vm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_execute.h	patch \|	diff1 \|	diff2 \|	blob \| history