com php-src: added utf16 and ucs2 for supported encodings: ext/mbstring/mbstring.c
| From: | Yasuo Ohgaki | Date: | Sat, 07 Mar 2015 17:03:43 +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-93719@lists.php.net to get a copy of this message | ||
Commit: 590e6f0cda6fc207585c0c3ebd36a96f91168b7b
Author: Masaki Kagaya <masakielastic@gmail.com> Thu, 19 Feb 2015 14:45:33 +0900
Parents: c55dea018f74212e74008270b2e5afe7469875da
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=590e6f0cda6fc207585c0c3ebd36a96f91168b7b
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 e075340..59ace4c 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -4613,6 +4613,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