From 6db3cf2aa850b172b557a56d59a3dae78eead5f0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 23 Oct 2019 09:35:32 +0200
Subject: fix preload, add more upstream patches for #78713 #78716

---
 dcd772325d0f7702a525f03c7d5dd04bf96d8e18.patch | 47 ++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 dcd772325d0f7702a525f03c7d5dd04bf96d8e18.patch

(limited to 'dcd772325d0f7702a525f03c7d5dd04bf96d8e18.patch')

diff --git a/dcd772325d0f7702a525f03c7d5dd04bf96d8e18.patch b/dcd772325d0f7702a525f03c7d5dd04bf96d8e18.patch
new file mode 100644
index 0000000..8d06ce8
--- /dev/null
+++ b/dcd772325d0f7702a525f03c7d5dd04bf96d8e18.patch
@@ -0,0 +1,47 @@
+From dcd772325d0f7702a525f03c7d5dd04bf96d8e18 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@php.net>
+Date: Wed, 23 Oct 2019 07:49:13 +0200
+Subject: [PATCH] add new ffi.preload  option in php.ini and display ini
+ entries in MINFO
+
+---
+ ext/ffi/ffi.c       | 2 ++
+ php.ini-development | 3 +++
+ php.ini-production  | 3 +++
+ 3 files changed, 8 insertions(+)
+
+diff --git a/ext/ffi/ffi.c b/ext/ffi/ffi.c
+index 17e8a8409d1f..39bf2f82bf09 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 3aefcd071db4..3f0c90cfca89 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 8dc9a32e0026..867de11c60d4 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=
-- 
cgit