From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 19 Aug 2014 05:28:13 +0000 (+0400)
Subject: Fixed encoding support
X-Git-Tag: PRE_64BIT_BRANCH_MERGE~42^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7dbb8117e4eb5477f5c4cb0bc320445476e55ecd;p=php

Fixed encoding support
---

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 2886d6c686..28b5fc2e0e 100644
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -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));
 }
 /* }}} */