moriyoshi Tue Nov 12 14:24:45 2002 EDT
Modified files:
/php4/ext/mbstring mbfilter.c mbfilter.h mbstring.c
Log:
Added neutral language spec for backwards compatibility
Index: php4/ext/mbstring/mbfilter.c
diff -u php4/ext/mbstring/mbfilter.c:1.49 php4/ext/mbstring/mbfilter.c:1.50
--- php4/ext/mbstring/mbfilter.c:1.49 Sun Nov 10 16:31:26 2002
+++ php4/ext/mbstring/mbfilter.c Tue Nov 12 14:24:45 2002
@@ -80,7 +80,7 @@
*
*/
-/* $Id: mbfilter.c,v 1.49 2002/11/10 21:31:26 moriyoshi Exp $ */
+/* $Id: mbfilter.c,v 1.50 2002/11/12 19:24:45 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -129,7 +129,17 @@
#include "unicode_table.h"
/* language structure */
-static const char *mbfl_language_uni_aliases[] = {"universal", "none", NULL};
+static const mbfl_language mbfl_language_neutral = {
+ mbfl_no_language_neutral,
+ "neutral",
+ "neutral",
+ NULL,
+ mbfl_no_encoding_utf8,
+ mbfl_no_encoding_base64,
+ mbfl_no_encoding_base64
+};
+
+static const char *mbfl_language_uni_aliases[] = {"universal", NULL};
static const mbfl_language mbfl_language_uni = {
mbfl_no_language_uni,
Index: php4/ext/mbstring/mbfilter.h
diff -u php4/ext/mbstring/mbfilter.h:1.16 php4/ext/mbstring/mbfilter.h:1.17
--- php4/ext/mbstring/mbfilter.h:1.16 Sat Nov 9 12:05:47 2002
+++ php4/ext/mbstring/mbfilter.h Tue Nov 12 14:24:45 2002
@@ -86,7 +86,7 @@
*
*/
-/* $Id: mbfilter.h,v 1.16 2002/11/09 17:05:47 moriyoshi Exp $ */
+/* $Id: mbfilter.h,v 1.17 2002/11/12 19:24:45 moriyoshi Exp $ */
#ifndef MBFL_MBFILTER_H
@@ -94,6 +94,7 @@
enum mbfl_no_language {
mbfl_no_language_invalid = -1,
+ mbfl_no_language_neutral,
mbfl_no_language_uni,
mbfl_no_language_min,
mbfl_no_language_catalan, /* ca */
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.136 php4/ext/mbstring/mbstring.c:1.137
--- php4/ext/mbstring/mbstring.c:1.136 Tue Nov 12 06:45:10 2002
+++ php4/ext/mbstring/mbstring.c Tue Nov 12 14:24:45 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.136 2002/11/12 11:45:10 helly Exp $ */
+/* $Id: mbstring.c,v 1.137 2002/11/12 19:24:45 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring" (currently only for Japanese)
@@ -721,7 +721,7 @@
/* {{{ php.ini directive registration */
PHP_INI_BEGIN()
- PHP_INI_ENTRY("mbstring.language", "none", PHP_INI_SYSTEM | PHP_INI_PERDIR,
OnUpdate_mbstring_language)
+ PHP_INI_ENTRY("mbstring.language", "neutral", PHP_INI_SYSTEM |
+PHP_INI_PERDIR, OnUpdate_mbstring_language)
PHP_INI_ENTRY("mbstring.detect_order", NULL, PHP_INI_ALL,
OnUpdate_mbstring_detect_order)
PHP_INI_ENTRY("mbstring.http_input", "pass", PHP_INI_ALL,
OnUpdate_mbstring_http_input)
PHP_INI_ENTRY("mbstring.http_output", "pass", PHP_INI_ALL,
OnUpdate_mbstring_http_output)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
