add new ffi.preload option in php.ini and display ini entries in MINFO

diff --git a/ext/ffi/ffi.c b/ext/ffi/ffi.c
index 17e8a8409d1f49c7a7ba4d988dee62c1d8cb480b..39bf2f82bf093dad6c25bdbf2b1e457b48c4d169 100644 (file)
--- a/ext/ffi/ffi.c
+++ b/ext/ffi/ffi.c
@@ -5077,6 +5077,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();
 }
 /* }}} */
 

diff --git a/php.ini-development b/php.ini-development
index 3aefcd071db4c172751a55d622c3c6674ba2ab86..3f0c90cfca8945436285ff94a21b06d774a627fa 100644 (file)
--- a/php.ini-development
+++ b/php.ini-development
@@ -1945,3 +1945,6 @@ ldap.max_links = -1
 ; "false"   - always disabled
 ; "true"    - always enabled
 ;ffi.enable=preload
+
+; List of headers files to preload
+;ffi.preload=

diff --git a/php.ini-production b/php.ini-production
index 8dc9a32e0026905ac5a881b0a93bdb9d8274953a..867de11c60d4e06ad9704633e873e5fdc1934a5b 100644 (file)
--- a/php.ini-production
+++ b/php.ini-production
@@ -1947,3 +1947,6 @@ ldap.max_links = -1
 ; "false"   - always disabled
 ; "true"    - always enabled
 ;ffi.enable=preload
+
+; List of headers files to preload
+;ffi.preload=