RE: [PHP-CVS] cvs: php4(PHP_4_2_2) /ext/domxml php_domxml.c

On Thu, 8 Aug 2002, Joseph Tate wrote: > Yeah, I realized that. Sorry. Bad Day. The bug had already been fixed in > 4_2_0. For some reason I thought that 4_2_2 was a separate branch of the > 4_2_0 tree so as to only insert the security fix, especially since everybody > believes that 4.2.2 is just 4.2.1 with those two patches. It is. > > Oh by the way, the domxml that shipped with 4.2.2 (according to the labeling > in CVS) didn't even compile. It was not the same version that shipped with > 4.2.1. I wonder what other things were "accidentally" inserted into the > release without testing (since there evidently was no branch). It compiled fine for me. Derick > > -----Original Message----- > > From: derick@php.net [mailto:derick@php.net] > > Sent: Thursday, August 08, 2002 6:01 AM > > To: Joseph Tate > > Cc: PHP Developers Mailing List; php-cvs@lists.php.net > > Subject: Re: [PHP-CVS] cvs: php4(PHP_4_2_2) /ext/domxml php_domxml.c > > > > > > Hey, > > > > this is the wrong branch to commit to, you need the PHP_4_2_0 one! > > > > Derick > > > > On Wed, 7 Aug 2002, Joseph Tate wrote: > > > > > jtate Wed Aug 7 13:21:51 2002 EDT > > > > > > Modified files: (Branch: PHP_4_2_2) > > > /php4/ext/domxml php_domxml.c > > > Log: > > > php_domxml.c > > > > > > > > > Index: php4/ext/domxml/php_domxml.c > > > diff -u php4/ext/domxml/php_domxml.c:1.118.2.8 > > php4/ext/domxml/php_domxml.c:1.118.2.8.2.1 > > > --- php4/ext/domxml/php_domxml.c:1.118.2.8 Fri May 3 11:16:14 2002 > > > +++ php4/ext/domxml/php_domxml.c Wed Aug 7 13:21:49 2002 > > > @@ -16,7 +16,7 @@ > > > > > +----------------------------------------------------------------------+ > > > */ > > > > > > -/* $Id: php_domxml.c,v 1.118.2.8 2002/05/03 15:16:14 chregu Exp $ */ > > > +/* $Id: php_domxml.c,v 1.118.2.8.2.1 2002/08/07 17:21:49 jtate Exp $ */ > > > > > > /* TODO > > > * - Support Notation Nodes > > > @@ -2034,7 +2034,7 @@ > > > * Uwe: must have been a temporary problem. It works for me > > with both > > > * xmlAddChildList and xmlAddChild > > > */ > > > -// child = xmlAddSibling(nodep, new_child); > > > + /*child = xmlAddSibling(nodep, new_child);*/ > > > child = xmlAddChild(nodep, new_child); > > > > > > if (NULL == child) { > > > @@ -2072,7 +2072,7 @@ > > > RETURN_FALSE; > > > } > > > > > > - // FIXME reverted xmlAddChildList; crashes > > > + /* FIXME reverted xmlAddChildList; crashes */ > > > child = xmlAddSibling(nodep, new_child); > > > > > > if (NULL == child) { > > > @@ -2670,7 +2670,7 @@ > > > > > > ids = (xmlHashTable *) docp->ids; > > > if(ids) { > > > - iter.elementId = (xmlChar *) > > > + iter.elementId = (xmlChar *) idname; > > > iter.element = NULL; > > > xmlHashScan(ids, idsHashScanner, &iter); > > > rv = php_domobject_new(iter.element, &retnode TSRMLS_CC); > > > > > > > > > > > > -- > > > PHP CVS Mailing List (http://www.php.net/) > > > To unsubscribe, visit: http://www.php.net/unsub.php > > > > > > > ------------------------------------------------------------------ > > --------- > > Did I help you? > > http://www.derickrethans.nl/link.php?url=giftlist > > Frequent ranting: http://www.derickrethans.nl/ > > ------------------------------------------------------------------ > > --------- > > PHP: Scripting the Web - derick@php.net > > All your branches are belong to me! > > SRM: Script Running Machine - www.vl-srm.net > > ------------------------------------------------------------------ > > --------- > > > > > > -- > > PHP CVS Mailing List (http://www.php.net/) > > To unsubscribe, visit: http://www.php.net/unsub.php > --------------------------------------------------------------------------- Did I help you? http://www.derickrethans.nl/link.php?url=giftlist Frequent ranting: http://www.derickrethans.nl/ --------------------------------------------------------------------------- PHP: Scripting the Web - derick@php.net All your branches are belong to me! SRM: Script Running Machine - www.vl-srm.net ---------------------------------------------------------------------------