Merge branch 'PHP-7.4'

author Remi Collet <remi@php.net>

Wed, 23 Oct 2019 05:49:29 +0000 (07:49 +0200)

committer Remi Collet <remi@php.net>

Wed, 23 Oct 2019 05:49:29 +0000 (07:49 +0200)
author Remi Collet <remi@php.net>
Wed, 23 Oct 2019 05:49:29 +0000 (07:49 +0200)
committer Remi Collet <remi@php.net>
Wed, 23 Oct 2019 05:49:29 +0000 (07:49 +0200)
diff --cc ext/ffi/ffi.c
Simple merge
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Remi Collet <remi@php.net>
	Wed, 23 Oct 2019 05:49:29 +0000 (07:49 +0200)
committer	Remi Collet <remi@php.net>
	Wed, 23 Oct 2019 05:49:29 +0000 (07:49 +0200)
		1	2
ext/ffi/ffi.c	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history