Added neutral language spec for backwards compatibility

diff --git a/ext/mbstring/mbfilter.c b/ext/mbstring/mbfilter.c
index dc38de3512d0ab10754415cd4d6892b5adc41bd5..623eccbd1d45036cf2c2adf66c76b96d085e6e67 100644 (file)
--- 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 b2d87baeb3b9cd5a8080c088a860a47050098501..f39ed8b2f542453a57812097d0360ddb79e781e5 100644 (file)
--- 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 a8e40e440b9548cdbfbde0e943f6ed2ed43adbc3..4a4c6363a052a920c7a6bdf3d53c529034be0aa7 100644 (file)
--- 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)