]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorRemi Collet <remi@php.net>
Thu, 24 Oct 2019 05:40:27 +0000 (07:40 +0200)
committerRemi Collet <remi@php.net>
Thu, 24 Oct 2019 05:40:27 +0000 (07:40 +0200)
* PHP-7.4:
  Added suppot for glob() wildcard matching in ffi.preload directive
  Reverting push to wrong repo
  Update alloc patch

1  2 
ext/ffi/ffi.c
php.ini-development
php.ini-production

diff --cc ext/ffi/ffi.c
Simple merge
Simple merge
Simple merge