com php-src: add new ffi.preload option in php.ini and display ini entries in MINFO: ext/ffi/ffi.c php.ini-development php.ini-production
| From: | Remi Collet | Date: | Wed, 23 Oct 2019 05:49:13 +0000 |
| Subject: | com php-src: add new ffi.preload option in php.ini and display ini entries in MINFO: ext/ffi/ffi.c php.ini-development php.ini-production | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-109012@lists.php.net to get a copy of this message | ||
Commit: dcd772325d0f7702a525f03c7d5dd04bf96d8e18
Author: Remi Collet <remi@php.net> Wed, 23 Oct 2019 07:49:13 +0200
Parents: 598bf7f5d5f9c76fd003590083c98736eb7702ab
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dcd772325d0f7702a525f03c7d5dd04bf96d8e18
Log:
add new ffi.preload option in php.ini and display ini entries in MINFO
Changed paths:
M ext/ffi/ffi.c
M php.ini-development
M php.ini-production
Diff:
diff --git a/ext/ffi/ffi.c b/ext/ffi/ffi.c
index 17e8a8409d1..39bf2f82bf0 100644
--- 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 3aefcd071db..3f0c90cfca8 100644
--- 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 8dc9a32e002..867de11c60d 100644
--- 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=