Merge branch 'PHP-7.4'

author George Peter Banyard <girgias@php.net>

Sat, 25 Jan 2020 12:31:43 +0000 (13:31 +0100)

committer George Peter Banyard <girgias@php.net>

Sat, 25 Jan 2020 12:31:43 +0000 (13:31 +0100)
author George Peter Banyard <girgias@php.net>
Sat, 25 Jan 2020 12:31:43 +0000 (13:31 +0100)
committer George Peter Banyard <girgias@php.net>
Sat, 25 Jan 2020 12:31:43 +0000 (13:31 +0100)
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	George Peter Banyard <girgias@php.net>
	Sat, 25 Jan 2020 12:31:43 +0000 (13:31 +0100)
committer	George Peter Banyard <girgias@php.net>
	Sat, 25 Jan 2020 12:31:43 +0000 (13:31 +0100)
		1	2
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history