From f6cf54d2b105a625d829f6766cf27b37ed265dc3 Mon Sep 17 00:00:00 2001
From: Hannes Magnusson <bjori@php.net>
Date: Fri, 12 Dec 2008 13:07:28 +0000
Subject: [PATCH] Fixed bug#46847 (phpinfo() is missing some settings.)

---
 NEWS                | 1 +
 ext/bcmath/bcmath.c | 1 +
 ext/dba/dba.c       | 1 +
 ext/exif/exif.c     | 1 +
 ext/gd/gd.c         | 2 ++
 ext/ldap/ldap.c     | 1 +
 6 files changed, 7 insertions(+)

diff --git a/NEWS b/NEWS
index eeeac4c5f0..463c5c3358 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ PHP                                                                        NEWS
 - Deprecated session_register(), session_unregister() and
   session_is_registered(). (Hannes)
 
+- Fixed bug #46847 (phpinfo() is missing some settings). (Hannes)
 - Fixed bug #46811 (ini_set() doesn't return false on failure). (Hannes)
 - Fixed bug #46746 (xmlrpc_decode_request outputs non-suppressable error when
   given bad data). (Ilia)
diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c
index fae6d94882..8384ba1b09 100644
--- a/ext/bcmath/bcmath.c
+++ b/ext/bcmath/bcmath.c
@@ -182,6 +182,7 @@ PHP_MINFO_FUNCTION(bcmath)
 	php_info_print_table_start();
 	php_info_print_table_row(2, "BCMath support", "enabled");
 	php_info_print_table_end();
+	DISPLAY_INI_ENTRIES();
 }
 /* }}} */
 
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 4811a45ef5..fa26ecdabf 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -524,6 +524,7 @@ PHP_MINFO_FUNCTION(dba)
 		php_info_print_table_row(2, "Supported handlers", "none");
 	}
 	php_info_print_table_end();
+	DISPLAY_INI_ENTRIES();
 }
 /* }}} */
 
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 23eec4475e..452f39d5a8 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -150,6 +150,7 @@ PHP_MINFO_FUNCTION(exif)
 	php_info_print_table_row(2, "Supported EXIF Version", "0220");
 	php_info_print_table_row(2, "Supported filetypes", "JPEG,TIFF");
 	php_info_print_table_end();
+	DISPLAY_INI_ENTRIES();
 }
 /* }}} */
 
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index bc4c06f336..589b31b530 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1114,6 +1114,7 @@ PHP_MSHUTDOWN_FUNCTION(gd)
 #if HAVE_GD_FONTMUTEX && HAVE_LIBFREETYPE
 	gdFontCacheMutexShutdown();
 #endif
+	UNREGISTER_INI_ENTRIES();
 	return SUCCESS;
 }
 #endif
@@ -1312,6 +1313,7 @@ PHP_MINFO_FUNCTION(gd)
 	php_info_print_table_row(2, "JIS-mapped Japanese Font Support", "enabled");
 #endif
 	php_info_print_table_end();
+	DISPLAY_INI_ENTRIES();
 }
 /* }}} */
 
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index d142260954..828d19112b 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -271,6 +271,7 @@ PHP_MINFO_FUNCTION(ldap)
 #endif
 
 	php_info_print_table_end();
+	DISPLAY_INI_ENTRIES();
 }
 /* }}} */
 
-- 
2.50.1