com php-src: added utf16 and ucs2 for supported encodings: ext/mbstring/mbstring.c
| From: | Joe Watkins | Date: | Thu, 19 Feb 2015 05:45:33 +0000 |
| Subject: | com php-src: added utf16 and ucs2 for supported encodings: ext/mbstring/mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96516@lists.php.net to get a copy of this message | ||
Commit: 674b67ce0c1c2f7d22a88db1b5a51eae87c7b4c9
Author: Masaki Kagaya <masakielastic@gmail.com> Thu, 19 Feb 2015 14:45:33 +0900
Parents: ec4f74b29684933f62230db6341389f9d5388d63
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=674b67ce0c1c2f7d22a88db1b5a51eae87c7b4c9
Log:
added utf16 and ucs2 for supported encodings
Changed paths:
M ext/mbstring/mbstring.c
Diff:
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 9c62b06..3fdfdcb 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -4620,6 +4620,12 @@ static inline long php_mb_ord(const char* str, size_t str_len, const char*
enc)
|| no_enc == mbfl_no_encoding_utf32
|| no_enc == mbfl_no_encoding_utf32be
|| no_enc == mbfl_no_encoding_utf32le
+ || no_enc == mbfl_no_encoding_ucs2
+ || no_enc == mbfl_no_encoding_ucs2be
+ || no_enc == mbfl_no_encoding_ucs2le
+ || no_enc == mbfl_no_encoding_utf16
+ || no_enc == mbfl_no_encoding_utf16be
+ || no_enc == mbfl_no_encoding_utf16le
) {
supported = true;
} else if (no_enc == mbfl_no_encoding_pass