[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sun Jan 2 20:37:07 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1851r2=1.1852ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1851 php-src/ChangeLog:1.1852 --- php-src/ChangeLog:1.1851Sat Jan 1 20:36:26 2005 +++ php-src/ChangeLog Sun Jan 2 20:37:05 2005 @@ -1,3 +1,38 @@ +2005-01-02 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS + NEWS + Zend/zend_highlight.c + ZendEngine2/zend_highlight.c: + MFH: Fixed bug #31371 (highlight_file() trims new line after heredoc). + +* ZendEngine2/zend_highlight.c: + Fixed bug #31371 (highlight_file() trims new line after heredoc). + +2005-01-02 Rob Richards [EMAIL PROTECTED] + +* ext/dom/document.c: + allow parser flags to be passed to xinclude() + +* (PHP_5_0) + NEWS: + BFN + +2005-01-02 Moriyoshi Koizumi [EMAIL PROTECTED] + +* (PHP_4_3) + ext/standard/tests/array/bug29493.phpt + ext/standard/tests/array/bug29493.phpt + ext/standard/tests/array/bug31213.phpt + ext/standard/tests/array/bug31213.phpt: + - MFH: add testcases for bug #29493 and #31213. + +* ext/standard/tests/array/bug29493.phpt + ext/standard/tests/array/bug31213.phpt: +1.1.4; + - Add testcases for bug #29493 and #31213. + 2005-01-01 Wez Furlong [EMAIL PROTECTED] * (PHP_5_0) @@ -15143,7 +15178,7 @@ 2004-03-18 Pierre-Alain Joye [EMAIL PROTECTED] * ext/gd/tests/bug27582_2.phpt: - - Fix the test description and $Id: ChangeLog,v 1.1851 2005/01/02 01:36:26 changelog Exp $ + - Fix the test description and $Id: ChangeLog,v 1.1852 2005/01/03 01:37:05 changelog Exp $ 2004-03-18 Derick Rethans [EMAIL PROTECTED]
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Sun Jan 2 20:37:15 2005 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.610r2=1.611ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.610 ZendEngine2/ChangeLog:1.611 --- ZendEngine2/ChangeLog:1.610 Thu Dec 30 20:36:44 2004 +++ ZendEngine2/ChangeLog Sun Jan 2 20:37:14 2005 @@ -1,3 +1,12 @@ +2005-01-02 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_0) + zend_highlight.c: + MFH: Fixed bug #31371 (highlight_file() trims new line after heredoc). + +* zend_highlight.c: + Fixed bug #31371 (highlight_file() trims new line after heredoc). + 2004-12-30 Jani Taskinen [EMAIL PROTECTED] * (PHP_5_0) @@ -6628,7 +6637,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.610 2004/12/31 01:36:44 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.611 2005/01/03 01:37:14 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -8352,7 +8361,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.610 2004/12/31 01:36:44 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.611 2005/01/03 01:37:14 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/libxml libxml.c
rrichards Sun Jan 2 07:08:41 2005 EDT
Modified files:
/php-src/ext/libxml libxml.c
Log:
Fixed bug #31361 (simplexml/domxml segfault when adding node twice)
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.25r2=1.26ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.25 php-src/ext/libxml/libxml.c:1.26
--- php-src/ext/libxml/libxml.c:1.25Sun Dec 5 06:59:46 2004
+++ php-src/ext/libxml/libxml.c Sun Jan 2 07:08:41 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.25 2004/12/05 11:59:46 rrichards Exp $ */
+/* $Id: libxml.c,v 1.26 2005/01/02 12:08:41 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -725,6 +725,10 @@
ret_refcount = php_libxml_decrement_node_ptr(object TSRMLS_CC);
if (ret_refcount == 0) {
php_libxml_node_free_resource(nodep TSRMLS_CC);
+ } else {
+ if (obj_node object == obj_node-_private) {
+ obj_node-_private = NULL;
+ }
}
/* Safe to call as if the resource were freed then doc pointer
is NULL */
php_libxml_decrement_doc_ref(object TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/libxml libxml.c
rrichards Sun Jan 2 07:09:09 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/libxml libxml.c
Log:
MFH: Fixed bug #31361 (simplexml/domxml segfault when adding node twice)
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.18.2.5r2=1.18.2.6ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.18.2.5
php-src/ext/libxml/libxml.c:1.18.2.6
--- php-src/ext/libxml/libxml.c:1.18.2.5Tue Nov 9 03:13:04 2004
+++ php-src/ext/libxml/libxml.c Sun Jan 2 07:09:09 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.18.2.5 2004/11/09 08:13:04 dmitry Exp $ */
+/* $Id: libxml.c,v 1.18.2.6 2005/01/02 12:09:09 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -711,6 +711,10 @@
ret_refcount = php_libxml_decrement_node_ptr(object TSRMLS_CC);
if (ret_refcount == 0) {
php_libxml_node_free_resource(nodep TSRMLS_CC);
+ } else {
+ if (obj_node object == obj_node-_private) {
+ obj_node-_private = NULL;
+ }
}
/* Safe to call as if the resource were freed then doc pointer
is NULL */
php_libxml_decrement_doc_ref(object TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS
rrichards Sun Jan 2 07:09:35 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.175r2=1.1760.2.176ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.175 php-src/NEWS:1.1760.2.176 --- php-src/NEWS:1.1760.2.175 Thu Dec 30 10:23:06 2004 +++ php-src/NEWSSun Jan 2 07:09:34 2005 @@ -4,6 +4,7 @@ - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony) - Added length and charsetnr for field array and object in mysqli. (Georg) - Fixed a bug in mysqli_stmt_execute() (type conversion with NULL values). (Georg) +- Fixed bug #31361 (simplexml/domxml segfault when adding node twice). (Rob) - Fixed bug #31142 (imap_mail_compose() fails to generate correct output). (Ilia) - Fixed bug #31139 (XML Parser Functions seem to drop amp; when parsing). (Rob) - Fixed bug #3 (Compile failure of zend_strtod.c). (Derick) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom document.c
rrichards Sun Jan 2 07:22:36 2005 EDT
Modified files:
/php-src/ext/domdocument.c
Log:
allow parser flags to be passed to xinclude()
http://cvs.php.net/diff.php/php-src/ext/dom/document.c?r1=1.62r2=1.63ty=u
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.62 php-src/ext/dom/document.c:1.63
--- php-src/ext/dom/document.c:1.62 Sun Dec 5 07:01:44 2004
+++ php-src/ext/dom/document.c Sun Jan 2 07:22:36 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: document.c,v 1.62 2004/12/05 12:01:44 rrichards Exp $ */
+/* $Id: document.c,v 1.63 2005/01/02 12:22:36 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1743,23 +1743,27 @@
}
}
-/* {{{ proto int dom_document_xinclude()
+/* {{{ proto int dom_document_xinclude([int options])
Substitutues xincludes in a DomDocument */
PHP_FUNCTION(dom_document_xinclude)
{
zval *id;
xmlDoc *docp;
xmlNodePtr root;
- int err;
+ int err, flags = 0;
dom_object *intern;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
O, id, dom_document_class_entry) == FAILURE) {
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
O|l, id, dom_document_class_entry, flags) == FAILURE) {
return;
}
DOM_GET_OBJ(docp, id, xmlDocPtr, intern);
+#if LIBXML_VERSION = 20600
+ err = xmlXIncludeProcessFlags(docp, flags);
+#else
err = xmlXIncludeProcess (docp);
+#endif
/* XML_XINCLUDE_START and XML_XINCLUDE_END nodes need to be removed as
these
are added via xmlXIncludeProcess to mark beginning and ending of
xincluded document
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
