Merge branch 'PHP-7.4'

author Joe Watkins <krakjoe@php.net>

Mon, 11 Mar 2019 09:10:45 +0000 (10:10 +0100)

committer Joe Watkins <krakjoe@php.net>

Mon, 11 Mar 2019 09:10:45 +0000 (10:10 +0100)
author Joe Watkins <krakjoe@php.net>
Mon, 11 Mar 2019 09:10:45 +0000 (10:10 +0100)
committer Joe Watkins <krakjoe@php.net>
Mon, 11 Mar 2019 09:10:45 +0000 (10:10 +0100)
diff --cc Zend/zend.c
Simple merge
diff --cc Zend/zend.h
Simple merge
diff --cc main/main.c
Simple merge
author	Joe Watkins <krakjoe@php.net>
	Mon, 11 Mar 2019 09:10:45 +0000 (10:10 +0100)
committer	Joe Watkins <krakjoe@php.net>
	Mon, 11 Mar 2019 09:10:45 +0000 (10:10 +0100)
		1	2
Zend/zend.c	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend.h	patch \|	diff1 \|	diff2 \|	blob \| history
main/main.c	patch \|	diff1 \|	diff2 \|	blob \| history