com php-src: Fixed encoding support: ext/xml/xml.c
| From: | Dmitry Stogov | Date: | Tue, 19 Aug 2014 05:28:13 +0000 |
| Subject: | com php-src: Fixed encoding support: ext/xml/xml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80590@lists.php.net to get a copy of this message | ||
Commit: 7dbb8117e4eb5477f5c4cb0bc320445476e55ecd
Author: Dmitry Stogov <dmitry@zend.com> Tue, 19 Aug 2014 09:28:13 +0400
Parents: dd16f4f71660f84168b9294bb7ae601ef8db275b
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7dbb8117e4eb5477f5c4cb0bc320445476e55ecd
Log:
Fixed encoding support
Changed paths:
M ext/xml/xml.c
Diff:
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 2886d6c..28b5fc2 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));
}
/* }}} */