File php-5.1.2-mbstring.patch of Package php

--- ext/mbstring/mbstring.c	2006/01/01 12:50:08	1.224.2.12
+++ ext/mbstring/mbstring.c	2006/02/11 02:26:07	1.224.2.14
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: mbstring.c,v 1.224.2.12 2006/01/01 12:50:08 sniper Exp $ */
+/* $Id: mbstring.c,v 1.224.2.14 2006/02/11 02:26:07 hirokawa Exp $ */
 
 /*
  * PHP 4 Multibyte String module "mbstring"
@@ -164,7 +164,7 @@
 	ZEND_BEGIN_ARG_INFO(third_and_rest_force_ref, 1)
 		ZEND_ARG_PASS_INFO(0)
 		ZEND_ARG_PASS_INFO(0)
-	ZEND_END_ARG_INFO();
+	ZEND_END_ARG_INFO()
 
 /* {{{ mb_overload_def mb_ovld[] */
 static const struct mb_overload_def mb_ovld[] = {
@@ -3048,7 +3048,7 @@
 	char *extra_cmd=NULL;
 	int extra_cmd_len;
 	int i;
-	char *to_r;
+	char *to_r = NULL;
 	char *force_extra_parameters = INI_STR("mail.force_extra_parameters");
 	struct {
 		int cnt_type:1;
@@ -3334,6 +3334,7 @@
 	}
 
 	if (!typ || !strcasecmp("all", typ)) {
+		const mbfl_language *lang = mbfl_no2language(MBSTRG(current_language));
 		array_init(return_value);
 		if ((name = (char *)mbfl_no_encoding2name(MBSTRG(current_internal_encoding))) != NULL) {
 			add_assoc_string(return_value, "internal_encoding", name, 1);
@@ -3346,6 +3347,14 @@
 		}
 		if ((name = (char *)mbfl_no_encoding2name(MBSTRG(func_overload))) != NULL) {
 			add_assoc_string(return_value, "func_overload", name, 1);
+		}
+		if (lang != NULL) {
+			add_assoc_string(return_value, "mail_charset", 
+							 mbfl_no_encoding2name(lang->mail_charset), 1);
+			add_assoc_string(return_value, "mail_header_encoding", 
+							 mbfl_no_encoding2name(lang->mail_header_encoding), 1);
+			add_assoc_string(return_value, "mail_body_encoding", 
+							 mbfl_no_encoding2name(lang->mail_body_encoding), 1);
 		}
 	} else if (!strcasecmp("internal_encoding", typ)) {
 		if ((name = (char *)mbfl_no_encoding2name(MBSTRG(current_internal_encoding))) != NULL) {