summaryrefslogtreecommitdiffstats
path: root/dcd772325d0f7702a525f03c7d5dd04bf96d8e18.patch
blob: 8d06ce8df8b0a147e1218bb7cc4476192b6b2933 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
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=