Browse Source

Added neutral language spec for backwards compatibility

experimental/threaded
Moriyoshi Koizumi 24 years ago
parent
commit
268903ce6c
  1. 12
      ext/mbstring/mbfilter.c
  2. 1
      ext/mbstring/mbfilter.h
  3. 2
      ext/mbstring/mbstring.c

12
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,

1
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 */

2
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)

Loading…
Cancel
Save