]> granicus.if.org Git - php/commitdiff
Fixed encoding support
authorDmitry Stogov <dmitry@zend.com>
Tue, 19 Aug 2014 05:28:13 +0000 (09:28 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 19 Aug 2014 05:28:13 +0000 (09:28 +0400)
ext/xml/xml.c

index 2886d6c686ccfc523a0700c32f7b4a6af47f528f..28b5fc2e0e5a58359ecc0cb5c3ff8e33548501e4 100644 (file)
@@ -383,7 +383,7 @@ static void _xml_xmlchar_zval(const XML_Char *s, int len, const XML_Char *encodi
        if (len == 0) {
                len = _xml_xmlcharlen(s);
        }
-       ZVAL_STRINGL(ret, (char *)s, len);
+       ZVAL_STR(ret, xml_utf8_decode(s, len, encoding));
 }
 /* }}} */