chregu Sun Aug 6 19:38:45 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/simplexml simplexml.c
Log:
Fix #38354 (Unwanted reformatting of XML when using AsXML)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.184&r2=1.2027.2.547.2.185&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.184 php-src/NEWS:1.2027.2.547.2.185
--- php-src/NEWS:1.2027.2.547.2.184 Sun Aug 6 17:41:51 2006
+++ php-src/NEWS Sun Aug 6 19:38:45 2006
@@ -30,6 +30,7 @@
- Fixed phpinfo() cutoff of variables at \0. (Ilia)
- Fixed a bug in the filter extension that prevented magic_quotes_gpc from
being applied when RAW filter is used. (Ilia)
+- Fixed bug #38354 (Unwanted reformatting of XML when using AsXML). (Christian)
- Fixed bug #38347 (Segmentation fault when using foreach with an
unknown/empty
SimpleXMLElement). (Tony)
- Fixed bug #38322 (reading past array in sscanf() leads to arbitary code
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.10&r2=1.151.2.22.2.11&diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.10
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.11
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.10 Sun Aug 6 17:41:51 2006
+++ php-src/ext/simplexml/simplexml.c Sun Aug 6 19:38:45 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.10 2006/08/06 17:41:51 tony2001 Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.11 2006/08/06 19:38:45 chregu Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1205,7 +1205,7 @@
RETURN_FALSE;
}
- xmlNodeDumpOutput(outbuf, (xmlDocPtr)
sxe->document->ptr, node, 0, 1, NULL);
+ xmlNodeDumpOutput(outbuf, (xmlDocPtr)
sxe->document->ptr, node, 0, 0, NULL);
xmlOutputBufferClose(outbuf);
RETURN_TRUE;
}
@@ -1229,7 +1229,7 @@
RETURN_FALSE;
}
- xmlNodeDumpOutput(outbuf, (xmlDocPtr)
sxe->document->ptr, node, 0, 1, ((xmlDocPtr) sxe->document->ptr)->encoding);
+ xmlNodeDumpOutput(outbuf, (xmlDocPtr)
sxe->document->ptr, node, 0, 0, ((xmlDocPtr) sxe->document->ptr)->encoding);
xmlOutputBufferFlush(outbuf);
strval = xmlStrndup(outbuf->buffer->content,
outbuf->buffer->use);
strval_len = outbuf->buffer->use;
@@ -2313,7 +2313,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.10 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.11 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
