cvs: php4 /ext/domxml php_domxml.c
| From: | Joseph Tate | Date: | Wed, 07 Aug 2002 17:03:43 +0000 |
| Subject: | cvs: php4 /ext/domxml php_domxml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13192@lists.php.net to get a copy of this message | ||
jtate Wed Aug 7 13:03:43 2002 EDT
Modified files:
/php4/ext/domxml php_domxml.c
Log:
#Stupid. Sorry.
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.183 php4/ext/domxml/php_domxml.c:1.184
--- php4/ext/domxml/php_domxml.c:1.183 Wed Aug 7 12:52:00 2002
+++ php4/ext/domxml/php_domxml.c Wed Aug 7 13:03:42 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.c,v 1.183 2002/08/07 16:52:00 jtate Exp $ */
+/* $Id: php_domxml.c,v 1.184 2002/08/07 17:03:42 jtate Exp $ */
/* TODO
* - Support Notation Nodes
@@ -634,11 +634,6 @@
static void php_free_xml_node(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
xmlNodePtr node = (xmlNodePtr) rsrc->ptr;
-<<<<<<< php_domxml.c
-
- node_wrapper_dtor(node);
- dom_object_set_data(node, NULL);
-=======
/* if node has no parent, it will not be freed by php_free_xml_doc, so do it here
and for all children as well. */
@@ -651,7 +646,6 @@
node_wrapper_dtor(node);
}
->>>>>>> 1.181
}