summaryrefslogtreecommitdiff
path: root/ext/standard/info.c
diff options
context:
space:
mode:
authorMoriyoshi Koizumi <moriyoshi@php.net>2010-12-19 16:36:37 +0000
committerMoriyoshi Koizumi <moriyoshi@php.net>2010-12-19 16:36:37 +0000
commitbbf3d43c1ee0ad53b03c3821cd630f0746d5e954 (patch)
treefd11ea79a69ee445ffde8310a3760603bf3df821 /ext/standard/info.c
parentc28cac404d2d0590ba2811f41331c60d09adbf1e (diff)
downloadphp-git-bbf3d43c1ee0ad53b03c3821cd630f0746d5e954.tar.gz
* Refactor zend_multibyte facility.
Now mbstring.script_encoding is superseded by zend.script_encoding.
Diffstat (limited to 'ext/standard/info.c')
-rw-r--r--ext/standard/info.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/ext/standard/info.c b/ext/standard/info.c
index 9093c8576a..30e1a8ab99 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -749,7 +749,17 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
php_info_print_table_row(2, "Zend Memory Manager", is_zend_mm(TSRMLS_C) ? "enabled" : "disabled" );
- php_info_print_table_row(2, "Zend Multibyte Support", CG(multibyte) ? "enabled" : "disabled");
+ {
+ const zend_multibyte_functions *functions = zend_multibyte_get_functions(TSRMLS_C);
+ char *descr;
+ if (functions) {
+ spprintf(&descr, 0, "provided by %s", functions->provider_name);
+ } else {
+ descr = estrdup("disabled");
+ }
+ php_info_print_table_row(2, "Zend Multibyte Support", descr);
+ efree(descr);
+ }
#if HAVE_IPV6
php_info_print_table_row(2, "IPv6 Support", "enabled" );