[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon Aug 7 01:30:57 2006 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2414r2=1.2415diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2414 php-src/ChangeLog:1.2415 --- php-src/ChangeLog:1.2414Sun Aug 6 01:30:57 2006 +++ php-src/ChangeLog Mon Aug 7 01:30:56 2006 @@ -1,3 +1,73 @@ +2006-08-06 Antony Dovgal [EMAIL PROTECTED] + +* configure.in + configure.in: + use -O0 with --enable-debug + +* ext/simplexml/tests/bug38354.phpt + ext/simplexml/tests/bug38354.phpt: + fix test + +* (PHP_5_2) + ext/simplexml/tests/bug38354.phpt: + add test + +* ext/simplexml/tests/bug38354.phpt + ext/simplexml/tests/bug38354.phpt: + + add test + +2006-08-06 Christian Stocker [EMAIL PROTECTED] + +* ext/simplexml/simplexml.c: + Fix #38354 (Unwanted reformatting of XML when using AsXML) + (MFB) + +* (PHP_5_2) + NEWS + ext/simplexml/simplexml.c: + + Fix #38354 (Unwanted reformatting of XML when using AsXML) + +2006-08-06 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ext/libxml/libxml.c + ext/simplexml/simplexml.c + ext/simplexml/tests/bug38347.phpt: + MFH: fix #38347 (Segmentation fault when using foreach with an + unknown/empty SimpleXMLElement) + +* ext/libxml/libxml.c + ext/simplexml/simplexml.c + ext/simplexml/tests/bug38347.phpt + ext/simplexml/tests/bug38347.phpt: + fix #38347 (Segmentation fault when using foreach with an unknown/empty + SimpleXMLElement) + +* ext/oci8/oci8.c + ext/oci8/oci8.c: + long - int + +2006-08-06 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_2) + ext/spl/spl_directory.c: + - MFH Fix cvs access through SplFileObject + +* ext/spl/spl_directory.c: + - Fix cvs access through SplFileObject + +2006-08-06 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + ext/simplexml/simplexml.c: + avoid extra strlen() call + +* ext/simplexml/simplexml.c: + avoid extra strlen() call, we have the length of the data + 2006-08-05 Antony Dovgal [EMAIL PROTECTED] * (PHP_5_2)
[PHP-CVS] cvs: php-src /ext/oci8 oci8.c
tony2001Sun Aug 6 14:09:46 2006 UTC
Modified files:
/php-src/ext/oci8 oci8.c
Log:
long - int
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.310r2=1.311diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.310 php-src/ext/oci8/oci8.c:1.311
--- php-src/ext/oci8/oci8.c:1.310 Sat Aug 5 20:56:12 2006
+++ php-src/ext/oci8/oci8.c Sun Aug 6 14:09:46 2006
@@ -26,7 +26,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.310 2006/08/05 20:56:12 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.311 2006/08/06 14:09:46 tony2001 Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -668,7 +668,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
php_info_print_table_row(2, Version, 1.2.1);
- php_info_print_table_row(2, Revision, $Revision: 1.310 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.311 $);
sprintf(buf, %ld, OCI_G(num_persistent));
php_info_print_table_row(2, Active Persistent Connections, buf);
@@ -1057,11 +1057,10 @@
else if (!persistent zend_hash_find(EG(regular_list),
hashed_details.c, hashed_details.len+1, (void **) le) == SUCCESS) {
found = 1;
if (le-type == le_index_ptr) {
- int type;
- long link;
+ int type, link;
void *ptr;
- link = (long) le-ptr;
+ link = (int) le-ptr;
ptr = zend_list_find(link,type);
if (ptr (type == le_connection)) {
connection = (php_oci_connection *)ptr;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/oci8 oci8.c
tony2001Sun Aug 6 14:09:58 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/oci8 oci8.c
Log:
long - int
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.12r2=1.269.2.16.2.13diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.12
php-src/ext/oci8/oci8.c:1.269.2.16.2.13
--- php-src/ext/oci8/oci8.c:1.269.2.16.2.12 Sat Aug 5 20:56:43 2006
+++ php-src/ext/oci8/oci8.c Sun Aug 6 14:09:58 2006
@@ -26,7 +26,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.269.2.16.2.12 2006/08/05 20:56:43 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.269.2.16.2.13 2006/08/06 14:09:58 tony2001 Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -653,7 +653,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
php_info_print_table_row(2, Version, 1.2.1);
- php_info_print_table_row(2, Revision, $Revision: 1.269.2.16.2.12 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.269.2.16.2.13 $);
sprintf(buf, %ld, OCI_G(num_persistent));
php_info_print_table_row(2, Active Persistent Connections, buf);
@@ -1042,11 +1042,10 @@
else if (!persistent zend_hash_find(EG(regular_list),
hashed_details.c, hashed_details.len+1, (void **) le) == SUCCESS) {
found = 1;
if (le-type == le_index_ptr) {
- int type;
- long link;
+ int type, link;
void *ptr;
- link = (long) le-ptr;
+ link = (int) le-ptr;
ptr = zend_list_find(link,type);
if (ptr (type == le_connection)) {
connection = (php_oci_connection *)ptr;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
tony2001Sun Aug 6 13:27:38 2006 UTC
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
avoid extra strlen() call, we have the length of the data
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.210r2=1.211diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.210
php-src/ext/simplexml/simplexml.c:1.211
--- php-src/ext/simplexml/simplexml.c:1.210 Mon Jun 26 15:36:45 2006
+++ php-src/ext/simplexml/simplexml.c Sun Aug 6 13:27:38 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.210 2006/06/26 15:36:45 bjori Exp $ */
+/* $Id: simplexml.c,v 1.211 2006/08/06 13:27:38 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1230,10 +1230,11 @@
xmlNodeDumpOutput(outbuf, (xmlDocPtr)
sxe-document-ptr, node, 0, 1, ((xmlDocPtr) sxe-document-ptr)-encoding);
xmlOutputBufferFlush(outbuf);
strval = xmlStrndup(outbuf-buffer-content,
outbuf-buffer-use);
+ strval_len = outbuf-buffer-use;
xmlOutputBufferClose(outbuf);
}
- RETVAL_STRINGL(strval, strlen(strval), 1);
+ RETVAL_STRINGL(strval, strval_len, 1);
xmlFree(strval);
} else {
RETVAL_FALSE;
@@ -2264,7 +2265,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.210 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.211 $);
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
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/simplexml simplexml.c
tony2001Sun Aug 6 13:27:47 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/simplexml simplexml.c
Log:
avoid extra strlen() call
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.8r2=1.151.2.22.2.9diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.8
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.9
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.8Mon Jun 26 13:41:52 2006
+++ php-src/ext/simplexml/simplexml.c Sun Aug 6 13:27:46 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.8 2006/06/26 13:41:52 bjori Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.9 2006/08/06 13:27:46 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1229,10 +1229,11 @@
xmlNodeDumpOutput(outbuf, (xmlDocPtr)
sxe-document-ptr, node, 0, 1, ((xmlDocPtr) sxe-document-ptr)-encoding);
xmlOutputBufferFlush(outbuf);
strval = xmlStrndup(outbuf-buffer-content,
outbuf-buffer-use);
+ strval_len = outbuf-buffer-use;
xmlOutputBufferClose(outbuf);
}
- RETVAL_STRINGL(strval, strlen(strval), 1);
+ RETVAL_STRINGL(strval, strval_len, 1);
xmlFree(strval);
} else {
RETVAL_FALSE;
@@ -2309,7 +2310,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.8 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.9 $);
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
[PHP-CVS] cvs: php-src /ext/libxml libxml.c /ext/simplexml simplexml.c /ext/simplexml/tests bug38347.phpt
tony2001Sun Aug 6 17:41:39 2006 UTC
Added files:
/php-src/ext/simplexml/testsbug38347.phpt
Modified files:
/php-src/ext/libxml libxml.c
/php-src/ext/simplexml simplexml.c
Log:
fix #38347 (Segmentation fault when using foreach with an unknown/empty
SimpleXMLElement)
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.50r2=1.51diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.50 php-src/ext/libxml/libxml.c:1.51
--- php-src/ext/libxml/libxml.c:1.50Tue Jul 4 07:34:32 2006
+++ php-src/ext/libxml/libxml.c Sun Aug 6 17:41:39 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.50 2006/07/04 07:34:32 dmitry Exp $ */
+/* $Id: libxml.c,v 1.51 2006/08/06 17:41:39 tony2001 Exp $ */
#define IS_EXT_MODULE
@@ -976,8 +976,8 @@
efree(object-document-doc_props);
}
efree(object-document);
+ object-document = NULL;
}
- object-document = NULL;
}
return ret_refcount;
@@ -1035,6 +1035,8 @@
obj_node-_private = NULL;
}
}
+ }
+ if (object != NULL object-document != NULL) {
/* Safe to call as if the resource were freed then doc pointer
is NULL */
php_libxml_decrement_doc_ref(object TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.211r2=1.212diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.211
php-src/ext/simplexml/simplexml.c:1.212
--- php-src/ext/simplexml/simplexml.c:1.211 Sun Aug 6 13:27:38 2006
+++ php-src/ext/simplexml/simplexml.c Sun Aug 6 17:41:39 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.211 2006/08/06 13:27:38 tony2001 Exp $ */
+/* $Id: simplexml.c,v 1.212 2006/08/06 17:41:39 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -195,6 +195,9 @@
if (sxe-iter.type == SXE_ITER_ELEMENT) {
orgnode = sxe_find_element_by_name(sxe, node, sxe-iter.name
TSRMLS_CC);
+ if (!orgnode) {
+ return NULL;
+ }
node = orgnode-children;
}
@@ -2265,7 +2268,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.211 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.212 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug38347.phpt?view=markuprev=1.1
Index: php-src/ext/simplexml/tests/bug38347.phpt
+++ php-src/ext/simplexml/tests/bug38347.phpt
--TEST--
Bug #38347 (Segmentation fault when using foreach with an unknown/empty
SimpleXMLElement)
--SKIPIF--
?php if (!extension_loaded(simplexml)) print skip; ?
--FILE--
?php
function iterate($xml)
{
print_r($xml);
foreach ($xml-item as $item) {
echo This code will crash!;
}
}
$xmlstr = xmlitemItem 1/itemitemItem 2/item/xml;
$xml = simplexml_load_string($xmlstr);
iterate($xml-unknown);
echo Done\n;
?
--EXPECTF--
SimpleXMLElement Object
(
)
Warning: iterate(): Node no longer exists in %s on line %d
Done
--UEXPECTF--
SimpleXMLElement Object
(
)
Warning: iterate(): Node no longer exists in %s on line %d
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/libxml libxml.c /ext/simplexml simplexml.c /ext/simplexml/tests bug38347.phpt
tony2001Sun Aug 6 17:41:52 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/simplexml/testsbug38347.phpt
Modified files:
/php-srcNEWS
/php-src/ext/libxml libxml.c
/php-src/ext/simplexml simplexml.c
Log:
MFH: fix #38347 (Segmentation fault when using foreach with an unknown/empty
SimpleXMLElement)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.183r2=1.2027.2.547.2.184diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.183 php-src/NEWS:1.2027.2.547.2.184
--- php-src/NEWS:1.2027.2.547.2.183 Fri Aug 4 20:31:19 2006
+++ php-src/NEWSSun Aug 6 17:41:51 2006
@@ -30,6 +30,8 @@
- 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 #38347 (Segmentation fault when using foreach with an
unknown/empty
+ SimpleXMLElement). (Tony)
- Fixed bug #38322 (reading past array in sscanf() leads to arbitary code
execution). (Tony)
- Fixed bug #38303 (spl_autoload_register() supress all errors silently).
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.32.2.7.2.5r2=1.32.2.7.2.6diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.32.2.7.2.5
php-src/ext/libxml/libxml.c:1.32.2.7.2.6
--- php-src/ext/libxml/libxml.c:1.32.2.7.2.5Tue Jul 4 07:26:53 2006
+++ php-src/ext/libxml/libxml.c Sun Aug 6 17:41:51 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.32.2.7.2.5 2006/07/04 07:26:53 dmitry Exp $ */
+/* $Id: libxml.c,v 1.32.2.7.2.6 2006/08/06 17:41:51 tony2001 Exp $ */
#define IS_EXT_MODULE
@@ -966,8 +966,8 @@
efree(object-document-doc_props);
}
efree(object-document);
+ object-document = NULL;
}
- object-document = NULL;
}
return ret_refcount;
@@ -1025,6 +1025,8 @@
obj_node-_private = NULL;
}
}
+ }
+ if (object != NULL object-document != NULL) {
/* Safe to call as if the resource were freed then doc pointer
is NULL */
php_libxml_decrement_doc_ref(object TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.9r2=1.151.2.22.2.10diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.9
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.10
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.9Sun Aug 6 13:27:46 2006
+++ php-src/ext/simplexml/simplexml.c Sun Aug 6 17:41:51 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.9 2006/08/06 13:27:46 tony2001 Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.10 2006/08/06 17:41:51 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -195,6 +195,9 @@
if (sxe-iter.type == SXE_ITER_ELEMENT) {
orgnode = sxe_find_element_by_name(sxe, node, sxe-iter.name
TSRMLS_CC);
+ if (!orgnode) {
+ return NULL;
+ }
node = orgnode-children;
}
@@ -2310,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.9 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.10 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug38347.phpt?view=markuprev=1.1
Index: php-src/ext/simplexml/tests/bug38347.phpt
+++ php-src/ext/simplexml/tests/bug38347.phpt
--TEST--
Bug #38347 (Segmentation fault when using foreach with an unknown/empty
SimpleXMLElement)
--SKIPIF--
?php if (!extension_loaded(simplexml)) print skip; ?
--FILE--
?php
function iterate($xml)
{
print_r($xml);
foreach ($xml-item as $item) {
echo This code will crash!;
}
}
$xmlstr = xmlitemItem 1/itemitemItem 2/item/xml;
$xml = simplexml_load_string($xmlstr);
iterate($xml-unknown);
echo Done\n;
?
--EXPECTF--
SimpleXMLElement Object
(
)
Warning: iterate(): Node no longer exists in %s on line %d
Done
--UEXPECTF--
SimpleXMLElement Object
(
)
Warning: iterate(): Node no longer exists in %s on line %d
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/simplexml simplexml.c
chregu Sun Aug 6 19:38:45 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/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.184r2=1.2027.2.547.2.185diff_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/NEWSSun 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.10r2=1.151.2.22.2.11diff_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
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
chregu Sun Aug 6 19:39:38 2006 UTC
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
Fix #38354 (Unwanted reformatting of XML when using AsXML)
(MFB)
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.212r2=1.213diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.212
php-src/ext/simplexml/simplexml.c:1.213
--- php-src/ext/simplexml/simplexml.c:1.212 Sun Aug 6 17:41:39 2006
+++ php-src/ext/simplexml/simplexml.c Sun Aug 6 19:39:38 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.212 2006/08/06 17:41:39 tony2001 Exp $ */
+/* $Id: simplexml.c,v 1.213 2006/08/06 19:39:38 chregu Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1206,7 +1206,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;
}
@@ -1230,7 +1230,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;
@@ -2268,7 +2268,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.212 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.213 $);
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
[PHP-CVS] cvs: php-src /ext/simplexml/tests bug38354.phpt
tony2001Sun Aug 6 20:17:43 2006 UTC
Modified files:
/php-src/ext/simplexml/testsbug38354.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug38354.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/simplexml/tests/bug38354.phpt
diff -u php-src/ext/simplexml/tests/bug38354.phpt:1.1
php-src/ext/simplexml/tests/bug38354.phpt:1.2
--- php-src/ext/simplexml/tests/bug38354.phpt:1.1 Sun Aug 6 20:10:05 2006
+++ php-src/ext/simplexml/tests/bug38354.phpt Sun Aug 6 20:17:42 2006
@@ -23,8 +23,6 @@
a href=javascript:alert('1');strongItem Two/strong/a
/code
-string(66) a href=javascript:alert('1');
- strongItem Two/strong
-/a
+string(62) a href=javascript:alert('1');strongItem Two/strong/a
string(25) strongItem Two/strong
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/simplexml/tests bug38354.phpt
tony2001Sun Aug 6 20:17:51 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/simplexml/testsbug38354.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug38354.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/simplexml/tests/bug38354.phpt
diff -u php-src/ext/simplexml/tests/bug38354.phpt:1.1.2.2
php-src/ext/simplexml/tests/bug38354.phpt:1.1.2.3
--- php-src/ext/simplexml/tests/bug38354.phpt:1.1.2.2 Sun Aug 6 20:10:19 2006
+++ php-src/ext/simplexml/tests/bug38354.phpt Sun Aug 6 20:17:51 2006
@@ -23,8 +23,6 @@
a href=javascript:alert('1');strongItem Two/strong/a
/code
-string(66) a href=javascript:alert('1');
- strongItem Two/strong
-/a
+string(62) a href=javascript:alert('1');strongItem Two/strong/a
string(25) strongItem Two/strong
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml/tests bug38354.phpt
tony2001Sun Aug 6 20:10:05 2006 UTC
Added files:
/php-src/ext/simplexml/testsbug38354.phpt
Log:
add test
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug38354.phpt?view=markuprev=1.1
Index: php-src/ext/simplexml/tests/bug38354.phpt
+++ php-src/ext/simplexml/tests/bug38354.phpt
--TEST--
Bug #38354 (Unwanted reformatting of XML when using AsXML)
--SKIPIF--
?php if (!extension_loaded(simplexml)) print skip; ?
--FILE--
?php
$xml = simplexml_load_string(
'code
a href=javascript:alert(\'1\');strongItem Two/strong/a
/code'
);
foreach ($xml-xpath(//*) as $element) {
var_dump($element-asXML());
}
echo Done\n;
?
--EXPECTF--
string(101) ?xml version=1.0?
code
a href=javascript:alert('1');strongItem Two/strong/a
/code
string(66) a href=javascript:alert('1');
strongItem Two/strong
/a
string(25) strongItem Two/strong
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/simplexml/tests bug38354.phpt
tony2001Sun Aug 6 20:10:19 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/simplexml/testsbug38354.phpt
Log:
add test
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug38354.phpt?view=markuprev=1.1
Index: php-src/ext/simplexml/tests/bug38354.phpt
+++ php-src/ext/simplexml/tests/bug38354.phpt
--TEST--
Bug #38354 (Unwanted reformatting of XML when using AsXML)
--SKIPIF--
?php if (!extension_loaded(simplexml)) print skip; ?
--FILE--
?php
$xml = simplexml_load_string(
'code
a href=javascript:alert(\'1\');strongItem Two/strong/a
/code'
);
foreach ($xml-xpath(//*) as $element) {
var_dump($element-asXML());
}
echo Done\n;
?
--EXPECTF--
string(101) ?xml version=1.0?
code
a href=javascript:alert('1');strongItem Two/strong/a
/code
string(66) a href=javascript:alert('1');
strongItem Two/strong
/a
string(25) strongItem Two/strong
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
tony2001Sun Aug 6 20:45:43 2006 UTC
Modified files:
/php-srcconfigure.in
Log:
use -O0 with --enable-debug
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.608r2=1.609diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.608 php-src/configure.in:1.609
--- php-src/configure.in:1.608 Thu Jul 27 08:51:50 2006
+++ php-src/configure.inSun Aug 6 20:45:42 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.608 2006/07/27 08:51:50 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.609 2006/08/06 20:45:42 tony2001 Exp $ -*- autoconf
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -674,6 +674,10 @@
if test $PHP_DEBUG = yes; then
PHP_DEBUG=1
ZEND_DEBUG=yes
+ changequote({,})
+ CFLAGS=`echo $CFLAGS | $SED -e 's/-O[0-9]*//g'`
+ changequote([,])
+ CFLAGS=$CFLAGS -O0
else
PHP_DEBUG=0
ZEND_DEBUG=no
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in
tony2001Sun Aug 6 20:46:02 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcconfigure.in
Log:
use -O0 with --enable-debug
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.6r2=1.579.2.52.2.7diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.6 php-src/configure.in:1.579.2.52.2.7
--- php-src/configure.in:1.579.2.52.2.6 Thu Jul 27 08:53:16 2006
+++ php-src/configure.inSun Aug 6 20:46:02 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.6 2006/07/27 08:53:16 sniper Exp $ -*-
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.7 2006/08/06 20:46:02 tony2001 Exp $ -*-
autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -676,6 +676,10 @@
if test $PHP_DEBUG = yes; then
PHP_DEBUG=1
ZEND_DEBUG=yes
+ changequote({,})
+ CFLAGS=`echo $CFLAGS | $SED -e 's/-O[0-9]*//g'`
+ changequote([,])
+ CFLAGS=$CFLAGS -O0
else
PHP_DEBUG=0
ZEND_DEBUG=no
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
