diff options
| author | Anatol Belski <ab@php.net> | 2014-08-19 07:45:28 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-19 07:45:28 +0200 |
| commit | 6bb3d049e83321c9898b517274e4b060bb5281e3 (patch) | |
| tree | 93c70dac10f6f6a93149bef1824e81df941aea73 | |
| parent | 56c7b27d6be7e4fb03f07e3ecb949d7f9c3ff857 (diff) | |
| parent | 7dbb8117e4eb5477f5c4cb0bc320445476e55ecd (diff) | |
| download | php-git-6bb3d049e83321c9898b517274e4b060bb5281e3.tar.gz | |
Merge branch 'master' of git.php.net:php-src
# By Dmitry Stogov
# Via Dmitry Stogov
* 'master' of git.php.net:php-src:
Fixed encoding support
| -rw-r--r-- | ext/xml/xml.c | 2 |
1 files changed, 1 insertions, 1 deletions
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)); } /* }}} */ |