svn: /php/php-src/trunk/Zend/ zend_multibyte.c

moriyoshi Mon, 20 Dec 2010 03:11:41 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=306485 Log: - Fix a bug that the script gets wrongly converted into UTF-8 when the script encoding is not GL-safe. Changed paths: U php/php-src/trunk/Zend/zend_multibyte.c Modified: php/php-src/trunk/Zend/zend_multibyte.c =================================================================== --- php/php-src/trunk/Zend/zend_multibyte.c 2010-12-20 02:19:31 UTC (rev 306484) +++ php/php-src/trunk/Zend/zend_multibyte.c 2010-12-20 03:11:41 UTC (rev 306485) @@ -217,15 +217,11 @@ ZEND_API size_t zend_multibyte_internal_encoding_filter(unsigned char **to, size_t *to_length, const unsigned char *from, size_t from_length TSRMLS_DC) { const zend_encoding *internal_encoding = zend_multibyte_get_internal_encoding(TSRMLS_C); - const zend_encoding *script_encoding = LANG_SCNG(script_encoding); if (!internal_encoding || !zend_multibyte_check_lexer_compatibility(internal_encoding)) { internal_encoding = zend_multibyte_encoding_utf8; } - if (!zend_multibyte_check_lexer_compatibility(script_encoding)) { - script_encoding = zend_multibyte_encoding_utf8; - } return zend_multibyte_encoding_converter(to, to_length, from, from_length, -script_encoding, internal_encoding TSRMLS_CC); +LANG_SCNG(script_encoding), internal_encoding TSRMLS_CC); } /*