Merge branch 'PHP-7.4'

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

Mon, 30 Dec 2019 22:22:39 +0000 (23:22 +0100)

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

Mon, 30 Dec 2019 22:22:39 +0000 (23:22 +0100)
author Nikita Popov <nikita.ppv@gmail.com>
Mon, 30 Dec 2019 22:22:39 +0000 (23:22 +0100)
committer Nikita Popov <nikita.ppv@gmail.com>
Mon, 30 Dec 2019 22:22:39 +0000 (23:22 +0100)
diff --cc ext/opcache/ZendAccelerator.c
Simple merge
diff --cc main/fopen_wrappers.c
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Mon, 30 Dec 2019 22:22:39 +0000 (23:22 +0100)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Mon, 30 Dec 2019 22:22:39 +0000 (23:22 +0100)
		1	2
ext/opcache/ZendAccelerator.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/fopen_wrappers.c	patch \|	diff1 \|	diff2 \|	blob \| history