iliaa Fri May 23 15:46:55 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/simplexml simplexml.c
/php-src NEWS
Log:
When dumping entire document to file via asXml() don't lose the encoding
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.40&r2=1.151.2.22.2.41&diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.40
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.41
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.40 Mon May 5 23:00:13 2008
+++ php-src/ext/simplexml/simplexml.c Fri May 23 15:46:54 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.40 2008/05/05 23:00:13 iliaa Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.41 2008/05/23 15:46:54 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1323,7 +1323,7 @@
if (node) {
if (node->parent && (XML_DOCUMENT_NODE == node->parent->type)) {
- xmlDocDumpMemory((xmlDocPtr) sxe->document->ptr,
&strval, &strval_len);
+ xmlDocDumpMemoryEnc((xmlDocPtr) sxe->document->ptr,
&strval, &strval_len, ((xmlDocPtr) sxe->document->ptr)->encoding);
RETVAL_STRINGL((char *)strval, strval_len, 1);
xmlFree(strval);
} else {
@@ -2446,7 +2446,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.40 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.41 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1159&r2=1.2027.2.547.2.1160&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1159 php-src/NEWS:1.2027.2.547.2.1160
--- php-src/NEWS:1.2027.2.547.2.1159 Mon May 19 15:18:39 2008
+++ php-src/NEWS Fri May 23 15:46:54 2008
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2008, PHP 5.2.7
+- When dumping entire document to file via asXml() don't lose the encoding.
+ (Ilia)
- Fixed a crash inside PDO when trying instantiate PDORow manually (Felipe)
- Fixed build failure of ext/mysqli with libmysql 6.0 - missing rpl
functions. (Andrey)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
