Merge branch 'PHP-7.4'

author Peter Kokot <peterkokot@gmail.com>

Sun, 7 Jul 2019 10:10:59 +0000 (12:10 +0200)

committer Peter Kokot <peterkokot@gmail.com>

Sun, 7 Jul 2019 10:10:59 +0000 (12:10 +0200)
author Peter Kokot <peterkokot@gmail.com>
Sun, 7 Jul 2019 10:10:59 +0000 (12:10 +0200)
committer Peter Kokot <peterkokot@gmail.com>
Sun, 7 Jul 2019 10:10:59 +0000 (12:10 +0200)
diff --cc build/php.m4
Simple merge
diff --cc configure.ac
Simple merge
diff --cc sapi/apache2handler/config.m4
Simple merge
author	Peter Kokot <peterkokot@gmail.com>
	Sun, 7 Jul 2019 10:10:59 +0000 (12:10 +0200)
committer	Peter Kokot <peterkokot@gmail.com>
	Sun, 7 Jul 2019 10:10:59 +0000 (12:10 +0200)
		1	2
build/php.m4	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
sapi/apache2handler/config.m4	patch \|	diff1 \|	diff2 \|	blob \| history