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

On Thu, 7 Mar 2002, Joseph Tate wrote: > Well shoot. Ring around the rosey... Do you want to merge it in, or do you want me to do it? Derick > > > -----Original Message----- > > From: derick@php.net [mailto:derick@php.net] > > Sent: Thursday, March 07, 2002 1:53 PM > > To: Joseph Tate > > Cc: php-cvs@lists.php.net > > Subject: RE: [PHP-CVS] cvs: php4(PHP_4_2_0) /ext/domxml php_domxml.c > > > > > > On Thu, 7 Mar 2002, Joseph Tate wrote: > > > > > Now just how is that best done. > > > > Keep it in, looks legit indeed ... but please discuss it first next time. > > >From the commit message it looked as if you were adding new stuff. > > > > Have a nice evening, > > Derick > > > > > > > > > -----Original Message----- > > > > From: Joseph Tate [mailto:jtate@mi-corporation.com] > > > > Sent: Thursday, March 07, 2002 1:40 PM > > > > To: derick@php.net > > > > Cc: Php-Cvs > > > > Subject: RE: [PHP-CVS] cvs: php4(PHP_4_2_0) /ext/domxml php_domxml.c > > > > > > > > > > > > This is not new functionality, it is a bug fix. It's been > > around since > > > > 4.1.0. A similar bug (Bug #14934) that you committed > > yourself was fixed, > > > > but this was not. The type node was set for some nodes and not > > > > for others. > > > > I'll revert it by your request, but I would like to see it in > > the 4.2.0 > > > > release since it is long overdue. I should have run it by > > you first. I'm > > > > sorry. > > > > > > > > Joseph > > > > > > > > > -----Original Message----- > > > > > From: derick@php.net [mailto:derick@php.net] > > > > > Sent: Thursday, March 07, 2002 12:46 PM > > > > > To: Joseph Tate > > > > > Cc: php-cvs@lists.php.net; PHP Quality Assurance Team Mailing List > > > > > Subject: Re: [PHP-CVS] cvs: php4(PHP_4_2_0) /ext/domxml php_domxml.c > > > > > > > > > > > > > > > Hello Jospeh, > > > > > > > > > > When was merging this fix discussed? This is new functionality which > > > > > should NOT go into the release branch. Please revert it. > > > > > > > > > > Derick > > > > > > > > > > > > > > > On Thu, 7 Mar 2002, Joseph Tate wrote: > > > > > > > > > > > jtate Thu Mar 7 11:48:50 2002 EDT > > > > > > > > > > > > Modified files: (Branch: PHP_4_2_0) > > > > > > /php4/ext/domxml php_domxml.c > > > > > > Log: > > > > > > Added type attributes to XML_DTD_NODE and XML_ATTRIBUTE_NODE > > > > > element types. > > > > > > Reported in bug #15918. > > > > > > > > > > > > > > > > > > Index: php4/ext/domxml/php_domxml.c > > > > > > diff -u php4/ext/domxml/php_domxml.c:1.118 > > > > > php4/ext/domxml/php_domxml.c:1.118.2.1 > > > > > > --- php4/ext/domxml/php_domxml.c:1.118 Thu Feb 28 > > 03:26:05 2002 > > > > > > +++ php4/ext/domxml/php_domxml.c Thu Mar 7 11:48:43 2002 > > > > > > @@ -16,7 +16,7 @@ > > > > > > > > > > > > > +----------------------------------------------------------------------+ > > > > > > */ > > > > > > > > > > > > -/* $Id: php_domxml.c,v 1.118 2002/02/28 08:26:05 > > sebastian Exp $ */ > > > > > > +/* $Id: php_domxml.c,v 1.118.2.1 2002/03/07 16:48:43 > > jtate Exp $ */ > > > > > > > > > > > > /* TODO > > > > > > * - Support Notation Nodes > > > > > > @@ -1010,6 +1010,7 @@ > > > > > > object_init_ex(wrapper, > > domxmlattr_class_entry); > > > > > > rsrc_type = le_domxmlattrp; > > > > > > add_property_stringl(wrapper, "name", (char > > > > > *) attrp->name, strlen(attrp->name), 1); > > > > > > + add_property_long(wrapper, "type", > > Z_TYPE_P(attrp)); > > > > > > content = > > xmlNodeGetContent((xmlNodePtr) attrp); > > > > > > if (content) > > > > > > add_property_stringl(wrapper, > > > > > "value", (char *) content, strlen(content), 1); > > > > > > @@ -1049,6 +1050,7 @@ > > > > > > xmlDtdPtr dtd = (xmlDtdPtr) obj; > > > > > > object_init_ex(wrapper, > > domxmldtd_class_entry); > > > > > > rsrc_type = le_domxmldtdp; > > > > > > + add_property_long(wrapper, "type", > > Z_TYPE_P(dtd)); > > > > > > if (dtd->ExternalID) > > > > > > add_property_string(wrapper, > > > > > "publicId", (char *) dtd->ExternalID, 1); > > > > > > if (dtd->SystemID) > > > > > > @@ -1064,10 +1066,9 @@ > > > > > > object_init_ex(wrapper, > > domxmlcdata_class_entry); > > > > > > rsrc_type = le_domxmlcdatap; > > > > > > content = xmlNodeGetContent(nodep); > > > > > > - if (content) { > > > > > > - add_property_long(wrapper, "type", > > > > > Z_TYPE_P(nodep)); > > > > > > + add_property_long(wrapper, "type", > > Z_TYPE_P(nodep)); > > > > > > + if (content) > > > > > > add_property_stringl(wrapper, > > > > > "content", (char *) content, strlen(content), 1); > > > > > > - } > > > > > > break; > > > > > > } > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > -- > > > > > > PHP CVS Mailing List (http://www.php.net/) > > > > > > To unsubscribe, visit: > > > > > > http://www.php.net/unsub.php > > > > > > > > > > > > > > > > > > ---------------------------------------------------------------------- > > > > > PHP: Scripting the Web - derick@php.net > > > > > All your branches are belong to me! > > > > > SRM: Site Resource Manager - www.vl-srm.net > > > > > > > ----------------------------------------------------------------------- > > > > > > > > > > > > -- > > > > PHP CVS Mailing List (http://www.php.net/) > > > > To unsubscribe, visit: > > > > http://www.php.net/unsub.php > > > > > > > ---------------------------------------------------------------------- > > PHP: Scripting the Web - derick@php.net > > All your branches are belong to me! > > SRM: Site Resource Manager - www.vl-srm.net > > ----------------------------------------------------------------------- > > > > > > -- > > PHP CVS Mailing List (http://www.php.net/) > > To unsubscribe, visit: http://www.php.net/unsub.php > ---------------------------------------------------------------------- PHP: Scripting the Web - derick@php.net All your branches are belong to me! SRM: Site Resource Manager - www.vl-srm.net -----------------------------------------------------------------------