Re: 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 -----------------------------------------------------------------------