Merge branch 'PHP-7.4'

* PHP-7.4:
  add new ffi.preload  option in php.ini and display ini entries in MINFO
This commit is contained in:
Remi Collet 2019-10-23 07:49:29 +02:00
commit 3d9bbd1b53
3 changed files with 8 additions and 0 deletions

View File

@ -4953,6 +4953,8 @@ ZEND_MINFO_FUNCTION(ffi)
php_info_print_table_start();
php_info_print_table_header(2, "FFI support", "enabled");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
}
/* }}} */

View File

@ -1915,3 +1915,6 @@ ldap.max_links = -1
; "false" - always disabled
; "true" - always enabled
;ffi.enable=preload
; List of headers files to preload
;ffi.preload=

View File

@ -1917,3 +1917,6 @@ ldap.max_links = -1
; "false" - always disabled
; "true" - always enabled
;ffi.enable=preload
; List of headers files to preload
;ffi.preload=