diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2002-11-12 19:24:45 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2002-11-12 19:24:45 +0000 |
| commit | 268903ce6c84072628cf955cb7d74e3f63242cf0 (patch) | |
| tree | 31ba2109137a6bc5aa8645328ac7fa92b5358aed /ext/mbstring | |
| parent | be5e379ec6c5836e26713683731e747d8ec84f02 (diff) | |
| download | php-git-268903ce6c84072628cf955cb7d74e3f63242cf0.tar.gz | |
Added neutral language spec for backwards compatibility
Diffstat (limited to 'ext/mbstring')
| -rw-r--r-- | ext/mbstring/mbfilter.c | 12 | ||||
| -rw-r--r-- | ext/mbstring/mbfilter.h | 1 | ||||
| -rw-r--r-- | ext/mbstring/mbstring.c | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/ext/mbstring/mbfilter.c b/ext/mbstring/mbfilter.c index dc38de3512..623eccbd1d 100644 --- a/ext/mbstring/mbfilter.c +++ b/ext/mbstring/mbfilter.c @@ -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, diff --git a/ext/mbstring/mbfilter.h b/ext/mbstring/mbfilter.h index b2d87baeb3..f39ed8b2f5 100644 --- a/ext/mbstring/mbfilter.h +++ b/ext/mbstring/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 */ diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index a8e40e440b..4a4c6363a0 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -721,7 +721,7 @@ static PHP_INI_MH(OnUpdate_mbstring_encoding_translation) /* {{{ 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) |