granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d04297a dcd7723)

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)
commit	3d9bbd1b5367ec562eb4bba9a1d976af81e709db
tree	a4890905a85f7438798fdd479c93b0c77ea20c00	tree \| snapshot
parent	d04297a8991d35215683c0aa89824653d3095c7b	commit \| diff
parent	dcd772325d0f7702a525f03c7d5dd04bf96d8e18	commit \| diff

Merge branch 'PHP-7.4'

* PHP-7.4:
add new ffi.preload option in php.ini and display ini entries in MINFO

ext/ffi/ffi.c	diff1 \|	diff2 \|	blob \| history
php.ini-development	diff1 \|	diff2 \|	blob \| history
php.ini-production	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.