diff options
| author | Dmitry Stogov <dmitry@php.net> | 2011-09-14 15:00:28 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2011-09-14 15:00:28 +0000 |
| commit | 93dd61659f691840c884c7eefaf12082f447fa91 (patch) | |
| tree | d47a7d1ec0b4646d9a2f0d4c8f2b870ab21ee170 /Zend/zend_multibyte.c | |
| parent | 750e4e10117d75e536bdcfdf344a18aaf8637739 (diff) | |
| download | php-git-93dd61659f691840c884c7eefaf12082f447fa91.tar.gz | |
Fixed bug #55552 (bad encoding not detected)
Diffstat (limited to 'Zend/zend_multibyte.c')
| -rw-r--r-- | Zend/zend_multibyte.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_multibyte.c b/Zend/zend_multibyte.c index 775ea78f5e..719dd8dd10 100644 --- a/Zend/zend_multibyte.c +++ b/Zend/zend_multibyte.c @@ -32,7 +32,7 @@ static const zend_encoding *dummy_encoding_fetcher(const char *encoding_name TSR static const char *dummy_encoding_name_getter(const zend_encoding *encoding) { - return NULL; + return (const char*)encoding; } static int dummy_encoding_lexer_compatibility_checker(const zend_encoding *encoding) @@ -79,11 +79,11 @@ static zend_multibyte_functions multibyte_functions = { dummy_internal_encoding_setter }; -ZEND_API const zend_encoding *zend_multibyte_encoding_utf32be; -ZEND_API const zend_encoding *zend_multibyte_encoding_utf32le; -ZEND_API const zend_encoding *zend_multibyte_encoding_utf16be; -ZEND_API const zend_encoding *zend_multibyte_encoding_utf16le; -ZEND_API const zend_encoding *zend_multibyte_encoding_utf8; +ZEND_API const zend_encoding *zend_multibyte_encoding_utf32be = (const zend_encoding*)"UTF-32BE"; +ZEND_API const zend_encoding *zend_multibyte_encoding_utf32le = (const zend_encoding*)"UTF-32LE"; +ZEND_API const zend_encoding *zend_multibyte_encoding_utf16be = (const zend_encoding*)"UTF-16BE"; +ZEND_API const zend_encoding *zend_multibyte_encoding_utf16le = (const zend_encoding*)"UTF-32LE"; +ZEND_API const zend_encoding *zend_multibyte_encoding_utf8 = (const zend_encoding*)"UTF-8"; ZEND_API int zend_multibyte_set_functions(const zend_multibyte_functions *functions TSRMLS_DC) { |