- Fix a bug that the script gets wrongly converted into UTF-8 when the script encodin...

diff --git a/Zend/zend_multibyte.c b/Zend/zend_multibyte.c
index e112978bded5c7ad9733deb6f250fa7117d82fed..e3be53f41edf0720c535dce1f25568d91e4637f9 100644 (file)
--- a/Zend/zend_multibyte.c
+++ b/Zend/zend_multibyte.c
@@ -217,15 +217,11 @@ ZEND_API size_t zend_multibyte_script_encoding_filter(unsigned char **to, size_t
 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);
 }
 
 /*