Merge branch 'PHP-7.4'

author Nikita Popov <nikita.ppv@gmail.com>

Mon, 4 Nov 2019 10:34:02 +0000 (11:34 +0100)

committer Nikita Popov <nikita.ppv@gmail.com>

Mon, 4 Nov 2019 10:34:02 +0000 (11:34 +0100)
author Nikita Popov <nikita.ppv@gmail.com>
Mon, 4 Nov 2019 10:34:02 +0000 (11:34 +0100)
committer Nikita Popov <nikita.ppv@gmail.com>
Mon, 4 Nov 2019 10:34:02 +0000 (11:34 +0100)
diff --cc build/php.m4
Simple merge
diff --cc configure.ac
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Mon, 4 Nov 2019 10:34:02 +0000 (11:34 +0100)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Mon, 4 Nov 2019 10:34:02 +0000 (11:34 +0100)
		1	2
build/php.m4	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history