summaryrefslogtreecommitdiff
path: root/ext/domxml/php_domxml.c
diff options
context:
space:
mode:
authorChristian Stocker <chregu@php.net>2002-05-18 20:19:43 +0000
committerChristian Stocker <chregu@php.net>2002-05-18 20:19:43 +0000
commitccd962e1553faeadc4c2b70f9dcd92dbee085c56 (patch)
tree41e66b0d91f7a647ede3f28f0a01b1dd3372225f /ext/domxml/php_domxml.c
parentb692311fdd1b70555bba1138c269f00180ad788d (diff)
downloadphp-git-ccd962e1553faeadc4c2b70f9dcd92dbee085c56.tar.gz
- delete attributes as well in php_free_xml_node
- more consistent naming in phpinfo()
Diffstat (limited to 'ext/domxml/php_domxml.c')
-rw-r--r--ext/domxml/php_domxml.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/domxml/php_domxml.c b/ext/domxml/php_domxml.c
index 721f8dfcb4..6051fc973e 100644
--- a/ext/domxml/php_domxml.c
+++ b/ext/domxml/php_domxml.c
@@ -591,6 +591,7 @@ static void php_free_xml_node(zend_rsrc_list_entry *rsrc TSRMLS_DC)
/* 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. */
if (node->parent == NULL) {
+ attr_list_wrapper_dtor(node->properties);
node_list_wrapper_dtor(node->children);
node_wrapper_dtor(node);
xmlFreeNode(node);
@@ -1432,8 +1433,8 @@ PHP_MINFO_FUNCTION(domxml)
/* don't know why that line was commented out in the previous version, so i left it (cmv) */
php_info_print_table_start();
php_info_print_table_row(2, "DOM/XML", "enabled");
+ php_info_print_table_row(2, "DOM/XML API Version", DOMXML_API_VERSION);
php_info_print_table_row(2, "libxml Version", LIBXML_DOTTED_VERSION);
- php_info_print_table_row(2, "domxml API Version", DOMXML_API_VERSION);
#if defined(LIBXML_HTML_ENABLED)
php_info_print_table_row(2, "HTML Support", "enabled");
#endif
@@ -1972,7 +1973,7 @@ PHP_FUNCTION(domxml_node_children)
/* }}} */
/* {{{ proto void domxml_node_unlink_node([object node])
- Deletes the node */
+ Deletes the node from tree, but not from memory*/
PHP_FUNCTION(domxml_node_unlink_node)
{
zval *id;
@@ -1990,6 +1991,7 @@ PHP_FUNCTION(domxml_node_unlink_node)
}
/* }}} */
+
/* {{{ proto object domxml_node_replace_node(object domnode)
Replaces one node with another node */
PHP_FUNCTION(domxml_node_replace_node)