From d667e05543b02da5fa122c5878c09067622013c4 Mon Sep 17 00:00:00 2001
From: Daniel Beulshausen <dbeu@php.net>
Date: Sun, 8 Oct 2000 11:45:18 +0000
Subject: [PATCH] more cleanup of info code

---
 ext/bcmath/bcmath.c             | 17 ++++++++++++++++-
 ext/bcmath/php_bcmath.h         |  2 ++
 ext/ftp/php_ftp.c               | 10 +++++++++-
 ext/ftp/php_ftp.h               |  1 +
 main/internal_functions_win32.c |  8 ++++----
 5 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c
index 31158496a5..4ec3f1d798 100644
--- a/ext/bcmath/bcmath.c
+++ b/ext/bcmath/bcmath.c
@@ -23,6 +23,7 @@
 #if WITH_BCMATH
 
 #include "number.h"
+#include "ext/standard/info.h"
 #include "php_bcmath.h"
 
 function_entry bcmath_functions[] = {
@@ -39,7 +40,14 @@ function_entry bcmath_functions[] = {
 };
 
 zend_module_entry bcmath_module_entry = {
-	"bcmath", bcmath_functions, NULL, NULL, PHP_RINIT(bcmath), PHP_RSHUTDOWN(bcmath), NULL, STANDARD_MODULE_PROPERTIES
+	"bcmath",
+    bcmath_functions,
+	NULL,
+	NULL,
+	PHP_RINIT(bcmath),
+	PHP_RSHUTDOWN(bcmath),
+	PHP_MINFO(bcmath),
+	STANDARD_MODULE_PROPERTIES
 };
 
 #ifdef COMPILE_DL_BCMATH
@@ -65,6 +73,13 @@ PHP_RSHUTDOWN_FUNCTION(bcmath)
 	return SUCCESS;
 }
 
+PHP_MINFO_FUNCTION(bcmath)
+{
+  php_info_print_table_start();
+  php_info_print_table_row(2, "BCMath support", "enabled");
+  php_info_print_table_end();
+}
+
 /* {{{ proto string bcadd(string left_operand, string right_operand [, int scale])
    Returns the sum of two arbitrary precision numbers */
 PHP_FUNCTION(bcadd)
diff --git a/ext/bcmath/php_bcmath.h b/ext/bcmath/php_bcmath.h
index 29c3f783a6..df7512d842 100644
--- a/ext/bcmath/php_bcmath.h
+++ b/ext/bcmath/php_bcmath.h
@@ -28,6 +28,8 @@ extern zend_module_entry bcmath_module_entry;
 
 extern PHP_RINIT_FUNCTION(bcmath);
 extern PHP_RSHUTDOWN_FUNCTION(bcmath);
+PHP_MINFO_FUNCTION(bcmath);
+
 PHP_FUNCTION(bcadd);
 PHP_FUNCTION(bcsub);
 PHP_FUNCTION(bcmul);
diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index 061b2aac6c..a7de40b128 100644
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -34,6 +34,7 @@
 
 #if HAVE_FTP
 
+#include "ext/standard/info.h"
 #include "ext/standard/file.h"
 
 #include "php_ftp.h"
@@ -75,7 +76,7 @@ zend_module_entry php_ftp_module_entry = {
 	NULL,
 	NULL,
 	NULL,
-	NULL,
+	PHP_MINFO(ftp),
 	STANDARD_MODULE_PROPERTIES
 };
 
@@ -102,6 +103,13 @@ PHP_MINIT_FUNCTION(ftp)
 	return SUCCESS;
 }
 
+PHP_MINFO_FUNCTION(ftp)
+{
+  php_info_print_table_start();
+  php_info_print_table_row(2, "FTP support", "enabled");
+  php_info_print_table_end();
+}
+
 
 #define	FTPBUF(ftp, pval) { \
 	int	id, type; \
diff --git a/ext/ftp/php_ftp.h b/ext/ftp/php_ftp.h
index 79a8e16642..6741ac66e2 100644
--- a/ext/ftp/php_ftp.h
+++ b/ext/ftp/php_ftp.h
@@ -39,6 +39,7 @@ extern zend_module_entry php_ftp_module_entry;
 #define php_ftp_module_ptr &php_ftp_module_entry
 
 PHP_MINIT_FUNCTION(ftp);
+PHP_MINFO_FUNCTION(ftp);
 
 PHP_FUNCTION(ftp_connect);
 PHP_FUNCTION(ftp_login);
diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index 9088251463..1626aecc5d 100644
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -64,19 +64,19 @@
 /* #include "dl/snmp/php_snmp.h" */
 
 zend_module_entry *php_builtin_extensions[] = {
+	phpext_standard_ptr,
 #if WITH_BCMATH
 	phpext_bcmath_ptr,
 #endif
-	phpext_standard_ptr,
 	phpext_calendar_ptr,
 	COM_module_ptr,
 	phpext_ftp_ptr,
-	phpext_pcre_ptr,
+	phpext_mysql_ptr,
 	phpext_odbc_ptr,
+	phpext_pcre_ptr,
 	phpext_session_ptr,
 	phpext_xml_ptr,
-	phpext_wddx_ptr,
-	phpext_mysql_ptr
+	phpext_wddx_ptr
 };
 
 #define EXTCOUNT (sizeof(php_builtin_extensions)/sizeof(zend_module_entry *))
-- 
2.50.1